Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-10 15:14:43 +00:00
Code Issues Projects Releases Packages Wiki Activity

Finish converting CONFIG_BOOTM_NETBSD et al to Kconfig

Browse source 
This converts the following to Kconfig:
   CONFIG_BOOTM_NETBSD
   CONFIG_BOOTM_RTEMS
   CONFIG_DESIGNWARE_WATCHDOG
   CONFIG_DISPLAY_CPUINFO
   CONFIG_DM_ETH
   CONFIG_DM_MMC
   CONFIG_DM_REGULATOR
   CONFIG_DM_SPI
   CONFIG_DM_SPI_FLASH
   CONFIG_ISO_PARTITION
   CONFIG_OF_SEPARATE
   CONFIG_SPI_FLASH_WINBOND
   CONFIG_SPL_ETH
   CONFIG_TIMER
   CONFIG_USB_DWC3
   CONFIG_USB_DWC3_GADGET
   CONFIG_USB_DWC3_OMAP
   CONFIG_USB_DWC3_PHY_OMAP
   CONFIG_USB_EHCI_TEGRA
   CONFIG_USB_GADGET_DOWNLOAD
   CONFIG_USB_GADGET_DUALSPEED
   CONFIG_USB_GADGET_MANUFACTURER
   CONFIG_USB_GADGET_PRODUCT_NUM
   CONFIG_USB_GADGET_VBUS_DRAW
   CONFIG_USB_GADGET_VENDOR_NUM

This catches a number of cases where board config files were #undef
various CONFIG options when building SPL, and that doesn't work.  Clean
up the related comments as well.

Signed-off-by: Tom Rini <trini@konsulko.com>
This commit is contained in:
Tom Rini 2022-03-21 21:33:29 -04:00
parent 694943cf2a
commit 439cc7fb05
28 changed files with 2 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
configs/s5p4418_nanopi2_defconfig
View file

@ -27,6 +27,8 @@ CONFIG_BOARD_LATE_INIT=y
CONFIG_HUSH_PARSER=y CONFIG_HUSH_PARSER=y
CONFIG_SYS_PROMPT="nanopi2# " CONFIG_SYS_PROMPT="nanopi2# "
CONFIG_CMD_BOOTZ=y CONFIG_CMD_BOOTZ=y
# CONFIG_BOOTM_NETBSD is not set
# CONFIG_BOOTM_RTEMS is not set
CONFIG_CMD_MEMTEST=y CONFIG_CMD_MEMTEST=y
CONFIG_CMD_GPIO=y CONFIG_CMD_GPIO=y
CONFIG_CMD_I2C=y CONFIG_CMD_I2C=y

1
include/config_uncmd_spl.h
View file

@ -13,7 +13,6 @@
#ifndef CONFIG_SPL_DM #ifndef CONFIG_SPL_DM
#undef CONFIG_DM_SERIAL #undef CONFIG_DM_SERIAL
#undef CONFIG_DM_I2C #undef CONFIG_DM_I2C
#undef CONFIG_DM_SPI
#endif #endif
#undef CONFIG_DM_STDIO #undef CONFIG_DM_STDIO

6
include/configs/adp-ae3xx.h
View file

@ -17,12 +17,6 @@
#define CONFIG_SKIP_TRUNOFF_WATCHDOG #define CONFIG_SKIP_TRUNOFF_WATCHDOG
#ifdef CONFIG_SKIP_LOWLEVEL_INIT
#ifdef CONFIG_OF_CONTROL
#undef CONFIG_OF_SEPARATE
#endif
#endif
/* /*
* Timer * Timer
*/ */

6
include/configs/adp-ag101p.h
View file

@ -19,12 +19,6 @@
#define CONFIG_MEM_REMAP #define CONFIG_MEM_REMAP
#endif #endif
#ifdef CONFIG_SKIP_LOWLEVEL_INIT
#ifdef CONFIG_OF_CONTROL
#undef CONFIG_OF_SEPARATE
#endif
#endif
/* /*
* Timer * Timer
*/ */

20
include/configs/am335x_evm.h
View file

@ -196,26 +196,6 @@
#endif #endif
#endif /* !CONFIG_MTD_RAW_NAND */ #endif /* !CONFIG_MTD_RAW_NAND */
/*
* For NOR boot, we must set this to the start of where NOR is mapped
* in memory.
*/
/*
* Disable MMC DM for SPL build and can be re-enabled after adding
* DM support in SPL
*/
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_DM_MMC
#undef CONFIG_TIMER
#endif
#if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USB_ETHER)
/* Remove other SPL modes. */
/* disable host part of MUSB in SPL */
/* disable EFI partitions and partition UUID support */
#endif
/* USB Device Firmware Update support */ /* USB Device Firmware Update support */
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
#define DFUARGS \ #define DFUARGS \

10
include/configs/am335x_shc.h
View file

@ -148,14 +148,4 @@
/* PMIC support */ /* PMIC support */
#define CONFIG_POWER_TPS65217 #define CONFIG_POWER_TPS65217
/* SPL */
/*
* Disable MMC DM for SPL build and can be re-enabled after adding
* DM support in SPL
*/
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_DM_MMC
#undef CONFIG_TIMER
#endif
#endif /* ! __CONFIG_AM335X_SHC_H */ #endif /* ! __CONFIG_AM335X_SHC_H */

22
include/configs/am43xx_evm.h
View file

@ -56,28 +56,6 @@
#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1 #define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1
#endif #endif
#if defined(CONFIG_SPL_BUILD) && !defined(CONFIG_SPL_USB_GADGET)
#undef CONFIG_USB_DWC3_PHY_OMAP
#undef CONFIG_USB_DWC3_OMAP
#undef CONFIG_USB_DWC3
#undef CONFIG_USB_DWC3_GADGET
#undef CONFIG_USB_GADGET_DOWNLOAD
#undef CONFIG_USB_GADGET_VBUS_DRAW
#undef CONFIG_USB_GADGET_MANUFACTURER
#undef CONFIG_USB_GADGET_VENDOR_NUM
#undef CONFIG_USB_GADGET_PRODUCT_NUM
#undef CONFIG_USB_GADGET_DUALSPEED
#endif
/*
* Disable MMC DM for SPL build and can be re-enabled after adding
* DM support in SPL
*/
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_TIMER
#endif
#ifndef CONFIG_SPL_BUILD #ifndef CONFIG_SPL_BUILD
/* USB Device Firmware Update support */ /* USB Device Firmware Update support */
#define DFUARGS \ #define DFUARGS \

10
include/configs/chiliboard.h
View file

@ -125,16 +125,6 @@
#define CONFIG_SYS_NAND_ECCSIZE 512 #define CONFIG_SYS_NAND_ECCSIZE 512
#define CONFIG_SYS_NAND_ECCBYTES 14 #define CONFIG_SYS_NAND_ECCBYTES 14
/* NAND: SPL related configs */
/*
* Disable MMC DM for SPL build and can be re-enabled after adding
* DM support in SPL
*/
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_DM_MMC
#undef CONFIG_TIMER
#endif
#if defined(CONFIG_ENV_IS_IN_NAND) #if defined(CONFIG_ENV_IS_IN_NAND)
#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE #define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE

6
include/configs/display5.h
View file

@ -33,12 +33,6 @@
* 0x1F00000 - 0x2000000 : SPI.factory (1MiB) * 0x1F00000 - 0x2000000 : SPI.factory (1MiB)
*/ */
/* SPI Flash Configs */
#if defined(CONFIG_SPL_BUILD)
#undef CONFIG_DM_SPI
#undef CONFIG_DM_SPI_FLASH
#endif
/* Below values are "dummy" - only to avoid build break */ /* Below values are "dummy" - only to avoid build break */
#define CONFIG_SYS_SPI_KERNEL_OFFS 0x150000 #define CONFIG_SYS_SPI_KERNEL_OFFS 0x150000
#define CONFIG_SYS_SPI_ARGS_OFFS 0x140000 #define CONFIG_SYS_SPI_ARGS_OFFS 0x140000

1
include/configs/imx8mm_icore_mx8mm.h
View file

@ -33,7 +33,6 @@
func(MMC, mmc, 2) \ func(MMC, mmc, 2) \
func(MMC, mmc, 0) func(MMC, mmc, 0)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#undef CONFIG_ISO_PARTITION
#else #else
#define BOOTENV #define BOOTENV
#endif #endif

1
include/configs/imx8mm_venice.h
View file

@ -41,7 +41,6 @@
func(MMC, mmc, 2) \ func(MMC, mmc, 2) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#undef CONFIG_ISO_PARTITION
#else #else
#define BOOTENV #define BOOTENV
#endif #endif

1
include/configs/imx8mn_venice.h
View file

@ -38,7 +38,6 @@
func(MMC, mmc, 2) \ func(MMC, mmc, 2) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#undef CONFIG_ISO_PARTITION
#else #else
#define BOOTENV #define BOOTENV
#endif #endif

2
include/configs/imx8mp_evk.h
View file

@ -26,8 +26,6 @@
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #define CONFIG_SPL_ABORT_ON_RAW_IMAGE
#undef CONFIG_DM_MMC
#define CONFIG_POWER_PCA9450 #define CONFIG_POWER_PCA9450
#endif #endif

2
include/configs/imx8mq_evk.h
View file

@ -29,8 +29,6 @@
/* For RAW image gives a error info not panic */ /* For RAW image gives a error info not panic */
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #define CONFIG_SPL_ABORT_ON_RAW_IMAGE
#undef CONFIG_DM_MMC
#define CONFIG_POWER_PFUZE100 #define CONFIG_POWER_PFUZE100
#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08
#endif #endif

2
include/configs/imx8mq_phanbell.h
View file

@ -25,8 +25,6 @@
#define CONFIG_MALLOC_F_ADDR 0x182000 #define CONFIG_MALLOC_F_ADDR 0x182000
/* For RAW image gives a error info not panic */ /* For RAW image gives a error info not panic */
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #define CONFIG_SPL_ABORT_ON_RAW_IMAGE
#undef CONFIG_DM_MMC
#endif #endif
/* ENET Config */ /* ENET Config */

3
include/configs/ls1088a_common.h
View file

@ -17,7 +17,6 @@
#define SPL_NO_SATA #define SPL_NO_SATA
#define SPL_NO_QSPI #define SPL_NO_QSPI
#define SPL_NO_IFC #define SPL_NO_IFC
#undef CONFIG_DISPLAY_CPUINFO
#endif #endif
#include <asm/arch/stream_id_lsch3.h> #include <asm/arch/stream_id_lsch3.h>
@ -131,8 +130,6 @@ unsigned long long get_qixis_addr(void);
#define CONFIG_HWCONFIG #define CONFIG_HWCONFIG
#define HWCONFIG_BUFFER_SIZE 128 #define HWCONFIG_BUFFER_SIZE 128
/* #define CONFIG_DISPLAY_CPUINFO */
#ifndef SPL_NO_ENV #ifndef SPL_NO_ENV
/* Initial environment variables */ /* Initial environment variables */
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \

5
include/configs/novena.h
View file

@ -42,11 +42,6 @@
/* SPL */ /* SPL */
#include "imx6_spl.h" /* common IMX6 SPL configuration */ #include "imx6_spl.h" /* common IMX6 SPL configuration */
/* Ethernet Configuration */
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_DM_ETH
#endif
/* I2C */ /* I2C */
#define CONFIG_I2C_MULTI_BUS #define CONFIG_I2C_MULTI_BUS
#define CONFIG_SYS_SPD_BUS_NUM 0 #define CONFIG_SYS_SPD_BUS_NUM 0

4
include/configs/opos6uldev.h
View file

@ -12,10 +12,6 @@
#ifdef CONFIG_SPL #ifdef CONFIG_SPL
#include "imx6_spl.h" #include "imx6_spl.h"
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_DM_REGULATOR
#endif
#endif #endif
/* Miscellaneous configurable options */ /* Miscellaneous configurable options */

2
include/configs/pico-imx8mq.h
View file

@ -25,8 +25,6 @@
#define CONFIG_MALLOC_F_ADDR 0x182000 #define CONFIG_MALLOC_F_ADDR 0x182000
/* For RAW image gives a error info not panic */ /* For RAW image gives a error info not panic */
#define CONFIG_SPL_ABORT_ON_RAW_IMAGE #define CONFIG_SPL_ABORT_ON_RAW_IMAGE
#undef CONFIG_DM_MMC
#endif #endif
/* ENET Config */ /* ENET Config */

10
include/configs/rcar-gen2-common.h
View file

@ -28,16 +28,6 @@
#define CONFIG_SYS_MONITOR_BASE 0x00000000 #define CONFIG_SYS_MONITOR_BASE 0x00000000
#define CONFIG_SYS_MONITOR_LEN (256 * 1024) #define CONFIG_SYS_MONITOR_LEN (256 * 1024)
/* ENV setting */
/* Common ENV setting */
/* SF MTD */
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_DM_SPI
#undef CONFIG_DM_SPI_FLASH
#endif
/* Timer */ /* Timer */
#define CONFIG_TMU_TIMER #define CONFIG_TMU_TIMER
#define CONFIG_SYS_TIMER_COUNTS_DOWN #define CONFIG_SYS_TIMER_COUNTS_DOWN

6
include/configs/s5p4418_nanopi2.h
View file

@ -88,12 +88,6 @@
/* Boot Argument Buffer Size */ /* Boot Argument Buffer Size */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE
/*-----------------------------------------------------------------------
* Etc Command definition
*/
#undef CONFIG_BOOTM_NETBSD
#undef CONFIG_BOOTM_RTEMS
/*----------------------------------------------------------------------- /*-----------------------------------------------------------------------
* serial console configuration * serial console configuration
*/ */

3
include/configs/socfpga_soc64_common.h
View file

@ -137,9 +137,6 @@ unsigned int cm_get_qspi_controller_clk_hz(void);
/* /*
* L4 Watchdog * L4 Watchdog
*/ */
#ifndef CONFIG_SPL_BUILD
#undef CONFIG_DESIGNWARE_WATCHDOG
#endif
#define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS #define CONFIG_DW_WDT_BASE SOCFPGA_L4WD0_ADDRESS
#ifdef CONFIG_TARGET_SOCFPGA_STRATIX10 #ifdef CONFIG_TARGET_SOCFPGA_STRATIX10
#ifndef __ASSEMBLY__ #ifndef __ASSEMBLY__

10
include/configs/tegra-common-post.h
View file

@ -95,14 +95,4 @@
#define CONFIG_TEGRA_SPI #define CONFIG_TEGRA_SPI
#endif #endif
/* overrides for SPL build here */
#ifdef CONFIG_SPL_BUILD
/* remove USB */
#ifdef CONFIG_USB_EHCI_TEGRA
#undef CONFIG_USB_EHCI_TEGRA
#endif
#endif /* CONFIG_SPL_BUILD */
#endif /* __TEGRA_COMMON_POST_H */ #endif /* __TEGRA_COMMON_POST_H */

12
include/configs/ti816x_evm.h
View file

@ -68,16 +68,4 @@
#define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \ #define CONFIG_SPL_MAX_SIZE (SRAM_SCRATCH_SPACE_ADDR - \
CONFIG_SPL_TEXT_BASE) CONFIG_SPL_TEXT_BASE)
/* Since SPL did pll and ddr initialization for us,
* we don't need to do it twice.
*/
/*
* Disable MMC DM for SPL build and can be re-enabled after adding
* DM support in SPL
*/
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_DM_MMC
#undef CONFIG_TIMER
#endif
#endif #endif

3
include/configs/ti_omap5_common.h
View file

@ -307,8 +307,5 @@
#define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \ #define CONFIG_SYS_SPL_ARGS_ADDR (CONFIG_SYS_SDRAM_BASE + \
(128 << 20)) (128 << 20))
#ifdef CONFIG_SPL_BUILD
#undef CONFIG_TIMER
#endif
#endif /* __CONFIG_TI_OMAP5_COMMON_H */ #endif /* __CONFIG_TI_OMAP5_COMMON_H */

8
include/configs/topic_miami.h
View file

@ -17,18 +17,10 @@
/* Fixup settings */ /* Fixup settings */
/* SPL settings */ /* SPL settings */
#undef CONFIG_SPL_ETH
#undef CONFIG_SPL_MAX_FOOTPRINT #undef CONFIG_SPL_MAX_FOOTPRINT
#define CONFIG_SPL_MAX_FOOTPRINT CONFIG_SYS_SPI_U_BOOT_OFFS #define CONFIG_SPL_MAX_FOOTPRINT CONFIG_SYS_SPI_U_BOOT_OFFS
#define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img"
/* FPGA commands that we don't use */
/* Extras */
/* Faster flash, ours may run at 108 MHz */
#undef CONFIG_SPI_FLASH_WINBOND
/* Setup proper boot sequences for Miami boards */ /* Setup proper boot sequences for Miami boards */
#if defined(CONFIG_USB_HOST) #if defined(CONFIG_USB_HOST)

1
include/configs/verdin-imx8mm.h
View file

@ -42,7 +42,6 @@
func(MMC, mmc, 0) \ func(MMC, mmc, 0) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#undef CONFIG_ISO_PARTITION
#else #else
#define BOOTENV #define BOOTENV
#endif #endif

1
include/configs/verdin-imx8mp.h
View file

@ -54,7 +54,6 @@
func(MMC, mmc, 2) \ func(MMC, mmc, 2) \
func(DHCP, dhcp, na) func(DHCP, dhcp, na)
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#undef CONFIG_ISO_PARTITION
#else #else
#define BOOTENV #define BOOTENV
#endif #endif