Convert CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG to Kconfig
Subsystems (15)
PATCH 1/5 Convert CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG to Kconfig
This converts the following to Kconfig:
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
--- configs/am335x_guardian_defconfig | 1 + configs/apalis-imx8_defconfig | 1 + configs/apalis-imx8x_defconfig | 1 + configs/cgtqmx8_defconfig | 1 + configs/colibri-imx8x_defconfig | 1 + configs/imx8qm_mek_defconfig | 1 + configs/imx8qm_rom7720_a1_4G_defconfig | 1 + configs/imx8qxp_mek_defconfig | 1 + include/configs/am335x_guardian.h | 2 -- include/configs/apalis-imx8.h | 2 -- include/configs/apalis-imx8x.h | 2 -- include/configs/cgtqmx8.h | 2 -- include/configs/colibri-imx8x.h | 2 -- include/configs/imx8mq_evk.h | 2 -- include/configs/imx8mq_phanbell.h | 2 -- include/configs/imx8qm_mek.h | 2 -- include/configs/imx8qm_rom7720.h | 1 - include/configs/imx8qxp_mek.h | 2 -- include/configs/pico-imx8mq.h | 2 -- 19 files changed, 8 insertions(+), 21 deletions(-)
configs/am335x_guardian_defconfig +1 -0
@@ -64,6 +64,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SPL_ENV_IS_NOWHERE=y CONFIG_VERSION_VARIABLE=y CONFIG_BOOTP_SEND_HOSTNAME=y
configs/apalis-imx8_defconfig +1 -0
@@ -34,6 +34,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_PART=1 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_VERSION_VARIABLE=y CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=4096
configs/apalis-imx8x_defconfig +1 -0
@@ -36,6 +36,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_PART=1 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_VERSION_VARIABLE=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_IP_DEFRAG=y
configs/cgtqmx8_defconfig +1 -0
@@ -46,6 +46,7 @@ CONFIG_CMD_FAT=y CONFIG_SPL_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_MMC_ENV_DEV=1 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SPL_DM=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y
configs/colibri-imx8x_defconfig +1 -0
@@ -32,6 +32,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_PART=1 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_VERSION_VARIABLE=y CONFIG_IP_DEFRAG=y CONFIG_TFTP_BLOCKSIZE=4096
configs/imx8qm_mek_defconfig +1 -0
@@ -50,6 +50,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_DEV=1 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SPL_DM=y CONFIG_SPL_CLK=y CONFIG_CLK_IMX8=y
configs/imx8qm_rom7720_a1_4G_defconfig +1 -0
@@ -46,6 +46,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_DEV=2 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y CONFIG_SPL_CLK=y
configs/imx8qxp_mek_defconfig +1 -0
@@ -50,6 +50,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_DEV=1 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y CONFIG_SPL_CLK=y
include/configs/am335x_guardian.h +0 -2
@@ -22,8 +22,6 @@#define V_OSCK 24000000/* Clock output from T2 */ #define V_SCLK (V_OSCK) -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -#ifndef CONFIG_SPL_BUILD #define MEM_LAYOUT_ENV_SETTINGS \
include/configs/apalis-imx8.h +0 -2
@@ -18,8 +18,6 @@#define USDHC2_BASE_ADDR 0x5b020000#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -/* Networking */ #define CONFIG_IPADDR 192.168.10.2#define CONFIG_NETMASK 255.255.255.0
include/configs/apalis-imx8x.h +0 -2
@@ -17,8 +17,6 @@#define USDHC2_BASE_ADDR 0x5b020000#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -#define CONFIG_IPADDR 192.168.10.2#define CONFIG_NETMASK 255.255.255.0#define CONFIG_SERVERIP 192.168.10.1
include/configs/cgtqmx8.h +0 -2
@@ -50,8 +50,6 @@#define CONFIG_ENV_OVERWRITE -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -/* Boot M4 */ #define M4_BOOT_ENV \ "m4_0_image=m4_0.bin\0" \
include/configs/colibri-imx8x.h +0 -2
@@ -19,8 +19,6 @@#define USDHC2_BASE_ADDR 0x5b020000#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -#define CONFIG_IPADDR 192.168.10.2#define CONFIG_NETMASK 255.255.255.0#define CONFIG_SERVERIP 192.168.10.1
include/configs/imx8mq_evk.h +0 -2
@@ -49,8 +49,6 @@#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -#define CONFIG_POWER #define CONFIG_POWER_I2C #define CONFIG_POWER_PFUZE100
include/configs/imx8mq_phanbell.h +0 -2
@@ -46,8 +46,6 @@#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -#define CONFIG_POWER #define CONFIG_POWER_I2C #endif
include/configs/imx8qm_mek.h +0 -2
@@ -42,8 +42,6 @@#define USDHC2_BASE_ADDR 0x5B020000#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -#ifdef CONFIG_AHAB_BOOT #define AHAB_ENV "sec_boot=yes\0"#else
include/configs/imx8qm_rom7720.h +0 -1
@@ -24,7 +24,6 @@#define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* FUSE command */ /* Boot M4 */
include/configs/imx8qxp_mek.h +0 -2
@@ -41,8 +41,6 @@#define USDHC1_BASE_ADDR 0x5B010000#define USDHC2_BASE_ADDR 0x5B020000 -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -#ifdef CONFIG_AHAB_BOOT #define AHAB_ENV "sec_boot=yes\0"#else
include/configs/pico-imx8mq.h +0 -2
@@ -45,8 +45,6 @@#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG -#define CONFIG_POWER #define CONFIG_POWER_I2C #endif
Signature · 1 line
2.17.1
PATCH 2/5 imx: Convert SERIAL_TAG support to ENV_VARS_UBOOT_RUNTIME_CONFIG
No iMX platforms have supported ATAG-based booting. They have however re-used the CONFIG_SERIAL_TAG option as a way to enable support of reading the OTP fuses and setting the serial# environment variable in some cases. Change the warp7 support to use this symbol, use this for updating the rest of the imx7 code, and update the imx8 conditionals.
--- arch/arm/include/asm/bootm.h | 5 ++++- arch/arm/mach-imx/imx8/cpu.c | 4 ++-- arch/arm/mach-imx/imx8ulp/soc.c | 2 +- arch/arm/mach-imx/mx7/soc.c | 12 +++++++++++- board/warp7/warp7.c | 4 ++-- configs/gwventana_emmc_defconfig | 1 + configs/gwventana_gw5904_defconfig | 1 + configs/gwventana_nand_defconfig | 1 + configs/imx8ulp_evk_defconfig | 1 + configs/puma-rk3399_defconfig | 1 + configs/warp7_bl33_defconfig | 1 + configs/warp7_defconfig | 1 + include/configs/apalis_imx6.h | 1 - include/configs/cm_fx6.h | 1 - include/configs/colibri_imx6.h | 1 - include/configs/gw_ventana.h | 3 --- include/configs/imx8ulp_evk.h | 2 -- include/configs/puma_rk3399.h | 2 -- include/configs/warp7.h | 3 --- 19 files changed, 27 insertions(+), 20 deletions(-)
arch/arm/include/asm/bootm.h +4 -1
@@ -41,9 +41,12 @@ extern void udc_disconnect(void);struct tag_serialnr ;#ifdef CONFIG_SERIAL_TAG #define BOOTM_ENABLE_SERIAL_TAG 1 -void get_board_serial (struct tag_serialnr *serialnr);#else #define BOOTM_ENABLE_SERIAL_TAG 0 +#endif +#if defined(CONFIG_SERIAL_TAG ) || defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG ) +void get_board_serial (struct tag_serialnr *serialnr); +#else static inline void get_board_serial (struct tag_serialnr *serialnr) { }
arch/arm/mach-imx/imx8/cpu.c +2 -2
@@ -172,7 +172,7 @@ enum boot_device get_boot_device(void)return boot_dev; } -#ifdef CONFIG_SERIAL_TAG +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #define FUSE_UNIQUE_ID_WORD0 16#define FUSE_UNIQUE_ID_WORD1 17void get_board_serial (struct tag_serialnr *serialnr)
@@ -201,7 +201,7 @@ void get_board_serial(struct tag_serialnr *serialnr) serialnr->low = val1; serialnr->high = val2; } -#endif /*CONFIG_SERIAL_TAG*/ +#endif /*CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG*/ #ifdef CONFIG_ENV_IS_IN_MMC __weak int board_mmc_get_env_dev (int devno)
arch/arm/mach-imx/imx8ulp/soc.c +1 -1
@@ -405,7 +405,7 @@ int dram_init(void)return 0 ; } -#ifdef CONFIG_SERIAL_TAG +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG void get_board_serial (struct tag_serialnr *serialnr) {u32 uid[4 ];
arch/arm/mach-imx/mx7/soc.c +11 -1
@@ -15,6 +15,7 @@#include <asm/arch/imx-rdc.h> #include <asm/mach-imx/boot_mode.h> #include <asm/arch/crm_regs.h> +#include <asm/bootm.h> #include <dm.h> #include <env.h> #include <imx_thermal.h>
@@ -337,10 +338,19 @@ int arch_cpu_init(void)int arch_misc_init (void ) {#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG +struct tag_serialnr serialnr; +char serial_string[0x20 ]; +if (is_mx7d ())env_set ("soc" ,"imx7d" );else env_set ("soc" ,"imx7s" ); + +/* Set serial# standard environment variable based on OTP settings */ +get_board_serial (&serialnr); +snprintf (serial_string,sizeof (serial_string),"0x%08x%08x" , + serialnr.low, serialnr.high); +env_set ("serial#" , serial_string);#endif #ifdef CONFIG_FSL_CAAM
@@ -351,7 +361,7 @@ int arch_misc_init(void) }#endif -#ifdef CONFIG_SERIAL_TAG +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* * OCOTP_TESTER * i.MX 7Solo Applications Processor Reference Manual, Rev. 0.1, 08/2016
board/warp7/warp7.c +2 -2
@@ -134,7 +134,7 @@ int checkboard(void)int board_late_init (void ) {struct wdog_regs *wdog = (struct wdog_regs *)WDOG1_BASE_ADDR ; -#ifdef CONFIG_SERIAL_TAG +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG struct tag_serialnr serialnr;char serial_string[0x20 ];#endif
@@ -156,7 +156,7 @@ int board_late_init(void)env_set_ulong (HAB_ENABLED_ENVNAME ,0 );#endif -#ifdef CONFIG_SERIAL_TAG +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* Set serial# standard environment variable based on OTP settings */ get_board_serial (&serialnr); snprintf(serial_string, sizeof(serial_string), "WaRP7-0x%08x%08x",
configs/gwventana_emmc_defconfig +1 -0
@@ -76,6 +76,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_PART=1 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_BOUNCE_BUFFER=y
configs/gwventana_gw5904_defconfig +1 -0
@@ -76,6 +76,7 @@ CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_PART=1 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_BOUNCE_BUFFER=y
configs/gwventana_nand_defconfig +1 -0
@@ -78,6 +78,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SYS_REDUNDAND_ENVIRONMENT=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NETCONSOLE=y CONFIG_DM=y CONFIG_BOUNCE_BUFFER=y
configs/imx8ulp_evk_defconfig +1 -0
@@ -37,6 +37,7 @@ CONFIG_CMD_REGULATOR=y CONFIG_CMD_EXT4_WRITE=y CONFIG_SPL_OF_CONTROL=y CONFIG_ENV_IS_IN_MMC=y +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM=y CONFIG_IMX_RGPIO2P=y
configs/puma-rk3399_defconfig +1 -0
@@ -44,6 +44,7 @@ CONFIG_ENV_OVERWRITE=y CONFIG_ENV_IS_IN_MMC=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y CONFIG_SYS_MMC_ENV_DEV=1 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y
configs/warp7_bl33_defconfig +1 -0
@@ -32,6 +32,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_BOUNCE_BUFFER=y CONFIG_DFU_MMC=y
configs/warp7_defconfig +1 -0
@@ -38,6 +38,7 @@ CONFIG_CMD_FS_GENERIC=y CONFIG_OF_CONTROL=y CONFIG_ENV_OVERWRITE=y CONFIG_SYS_RELOC_GD_ENV_ADDR=y +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_BOUNCE_BUFFER=y CONFIG_DFU_MMC=y
include/configs/apalis_imx6.h +0 -1
@@ -27,7 +27,6 @@#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_SERIAL_TAG /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024)
include/configs/cm_fx6.h +0 -1
@@ -186,7 +186,6 @@/* Boot */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) -#define CONFIG_SERIAL_TAG /* misc */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
include/configs/colibri_imx6.h +0 -1
@@ -25,7 +25,6 @@#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG #define CONFIG_REVISION_TAG -#define CONFIG_SERIAL_TAG /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024)
include/configs/gw_ventana.h +0 -3
@@ -26,9 +26,6 @@#define CONFIG_MACH_TYPE 4520/* Gateworks Ventana Platform */ -/* Serial ATAG */ -#define CONFIG_SERIAL_TAG -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
include/configs/imx8ulp_evk.h +0 -2
@@ -33,8 +33,6 @@#endif -#define CONFIG_SERIAL_TAG -#define CONFIG_REMAKE_ELF #define CONFIG_BOARD_EARLY_INIT_F
include/configs/puma_rk3399.h +0 -2
@@ -10,6 +10,4 @@#define SDRAM_BANK_SIZE (2UL << 30) -#define CONFIG_SERIAL_TAG -#endif
include/configs/warp7.h +0 -3
@@ -21,9 +21,6 @@#define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 -/* Switch on SERIAL_TAG */ -#define CONFIG_SERIAL_TAG -#define CONFIG_DFU_ENV_SETTINGS \ "dfu_alt_info=boot raw 0x2 0x1000 mmcpart 1\0" \
Signature · 1 line
2.17.1
Re: [PATCH 2/5] imx: Convert SERIAL_TAG support to ENV_VARS_UBOOT_RUNTIME_CONFIG
Quoted 10 lines · Tom Rini
No iMX platforms have supported ATAG-based booting. They have however re-used the
CONFIG_SERIAL_TAGoption as a way to enable support of reading the OTP fuses and setting the serial# environment variable in some cases. Change the warp7 support to use this symbol, use this for updating the rest of the imx7 code, and update the imx8 conditionals.Cc Stefano Babic <[email protected]>Cc Fabio Estevam <[email protected]>Cc NXP i.MX U-Boot Team <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 3/5 arm: Disable ATAGs support
In reply to Tom RiniWith the exception of nokia_rx51 and icnova-a20-swac, disable ATAG support. A large number of platforms had enabled support but never supported a kernel so old as to require it. Further, some platforms are old enough to support both, but are well supported by devicetree booting, and have been for a number of years. This is because some of the ATAGs related functions have been re-used to provide the same kind of information, but for devicetree or just generally to inform the user. When needed still, rename these functions to get_board_revision() instead, to avoid conflicts. In other cases, these functions were simply unused, so drop them.
---
There are some platforms, such as Synology that I'm worried should also perhaps be keeping this enabled. Also, after v1 of the series Stefan sent a patch for friendlyarm nanopi2, but with this more board update that particular path doesn't work. I've updated things a little to keep the spirit of that change.
--- arch/arm/Kconfig | 29 +++++++++++++++++++ board/CarMediaLab/flea3/flea3.c | 2 ++ board/Synology/common/Makefile | 2 +- board/beckhoff/mx53cx9020/mx53cx9020.c | 2 ++ board/broadcom/bcmstb/bcmstb.c | 5 ---- board/compulab/cm_fx6/cm_fx6.c | 2 ++ board/davinci/da8xxevm/da850evm.c | 2 ++ board/davinci/da8xxevm/omapl138_lcdk.c | 14 --------- board/freescale/imxrt1020-evk/imxrt1020-evk.c | 5 ---- board/freescale/imxrt1050-evk/imxrt1050-evk.c | 5 ---- board/freescale/mx51evk/mx51evk.c | 2 ++ board/freescale/mx53loco/mx53loco.c | 2 ++ board/freescale/mx6sabreauto/mx6sabreauto.c | 2 ++ board/friendlyarm/nanopi2/board.c | 8 ++--- board/friendlyarm/nanopi2/hwrev.c | 9 +++++- board/friendlyarm/nanopi2/hwrev.h | 2 +- board/ge/mx53ppd/mx53ppd.c | 2 ++ board/inversepath/usbarmory/usbarmory.c | 2 ++ board/lg/sniper/sniper.c | 2 ++ board/nokia/rx51/rx51.c | 2 ++ board/raspberrypi/rpi/rpi.c | 4 +-- board/samsung/common/exynos5-dt-types.c | 26 +++++++++-------- board/samsung/goni/goni.c | 5 ---- board/samsung/origen/origen.c | 5 ---- board/samsung/trats2/trats2.c | 2 ++ board/samsung/universal_c210/universal.c | 2 ++ .../stm32f429-discovery/stm32f429-discovery.c | 5 ---- .../stm32f429-evaluation.c | 5 ---- .../stm32f469-discovery/stm32f469-discovery.c | 5 ---- board/st/stm32f746-disco/stm32f746-disco.c | 5 ---- board/st/stm32h743-disco/stm32h743-disco.c | 5 ---- board/st/stm32h743-eval/stm32h743-eval.c | 5 ---- board/st/stm32h750-art-pi/stm32h750-art-pi.c | 5 ---- board/ti/panda/panda.c | 2 ++ board/ti/sdp4430/sdp.c | 2 ++ board/toradex/apalis_imx6/apalis_imx6.c | 5 ++-- board/toradex/colibri_imx6/colibri_imx6.c | 5 ++-- board/toradex/common/tdx-common.c | 8 ++--- board/toradex/common/tdx-common.h | 1 + configs/icnova-a20-swac_defconfig | 4 +++ configs/nokia_rx51_defconfig | 4 +++ configs/sandbox_defconfig | 4 +-- configs/socfpga_n5x_atf_defconfig | 5 ++-- configs/socfpga_n5x_defconfig | 5 ++-- configs/socfpga_n5x_vab_defconfig | 5 ++-- configs/xilinx_zynqmp_virt_defconfig | 2 +- include/configs/SBx81LIFKW.h | 14 --------- include/configs/SBx81LIFXCAT.h | 9 ------ include/configs/am3517_evm.h | 2 -- include/configs/apalis_imx6.h | 5 ---- include/configs/aspeed-common.h | 3 -- include/configs/at91sam9260ek.h | 3 -- include/configs/at91sam9261ek.h | 4 --- include/configs/at91sam9263ek.h | 4 --- include/configs/at91sam9m10g45ek.h | 3 -- include/configs/at91sam9n12ek.h | 3 -- include/configs/at91sam9rlek.h | 4 --- include/configs/at91sam9x5ek.h | 3 -- include/configs/bcmstb.h | 1 - include/configs/bk4r1.h | 3 -- include/configs/brppt1.h | 4 --- include/configs/brppt2.h | 3 -- include/configs/brsmarc1.h | 5 ---- include/configs/brxre1.h | 5 ---- include/configs/colibri_imx6.h | 5 ---- include/configs/colibri_pxa270.h | 2 -- include/configs/corvus.h | 3 -- include/configs/da850evm.h | 3 -- include/configs/devkit3250.h | 6 ---- include/configs/devkit8000.h | 2 -- include/configs/dh_imx6.h | 5 ---- include/configs/display5.h | 5 ---- include/configs/edminiv2.h | 9 ------ include/configs/ethernut5.h | 3 -- include/configs/exynos-common.h | 4 --- include/configs/exynos4-common.h | 2 -- include/configs/flea3.h | 5 ---- include/configs/ge_bx50v3.h | 4 --- include/configs/grpeach.h | 1 - include/configs/imx27lite-common.h | 4 --- include/configs/integrator-common.h | 3 -- include/configs/km/km_arm.h | 9 ------ include/configs/kp_imx6q_tpc.h | 4 --- include/configs/kzm9g.h | 4 --- include/configs/legoev3.h | 2 -- include/configs/ls1021aiot.h | 2 -- include/configs/ls1021aqds.h | 2 -- include/configs/ls1021atwr.h | 2 -- include/configs/ls1043aqds.h | 2 -- include/configs/ls1046aqds.h | 2 -- include/configs/m53menlo.h | 5 ---- include/configs/meesc.h | 5 ---- include/configs/mt7623.h | 3 -- include/configs/mt7629.h | 3 -- include/configs/mv-common.h | 9 ------ include/configs/mvebu_armada-37xx.h | 9 ------ include/configs/mvebu_armada-8k.h | 9 ------ include/configs/mx51evk.h | 5 ---- include/configs/mx53cx9020.h | 6 ---- include/configs/mx53loco.h | 6 ---- include/configs/mx53ppd.h | 6 ---- include/configs/mx6_common.h | 6 ---- include/configs/mx7ulp_com.h | 4 --- include/configs/mx7ulp_evk.h | 5 ---- include/configs/mxs.h | 4 --- include/configs/nokia_rx51.h | 5 ---- include/configs/odroid.h | 2 -- include/configs/odroid_xu3.h | 1 - include/configs/omap3_beagle.h | 5 ---- include/configs/omap3_evm.h | 5 ---- include/configs/omap3_igep00x0.h | 2 -- include/configs/omap3_logic.h | 5 ---- include/configs/omapl138_lcdk.h | 3 -- include/configs/pcm052.h | 3 -- include/configs/pm9261.h | 4 --- include/configs/pm9263.h | 4 --- include/configs/pm9g45.h | 3 -- include/configs/rcar-gen2-common.h | 4 --- include/configs/rcar-gen3-common.h | 4 --- include/configs/rpi.h | 5 ---- include/configs/s5p_goni.h | 5 ---- include/configs/sam9x60ek.h | 3 -- include/configs/siemens-am33x-common.h | 4 --- include/configs/smartweb.h | 3 -- include/configs/smdkc100.h | 4 --- include/configs/smdkv310.h | 1 - include/configs/snapper9260.h | 3 -- include/configs/snapper9g45.h | 3 -- include/configs/sniper.h | 10 ------- include/configs/socfpga_arria5_secu1.h | 1 - include/configs/stemmy.h | 3 -- include/configs/stih410-b2260.h | 2 -- include/configs/stm32f429-discovery.h | 5 ---- include/configs/stm32f429-evaluation.h | 5 ---- include/configs/stm32f469-discovery.h | 5 ---- include/configs/stm32f746-disco.h | 5 ---- include/configs/stm32h743-disco.h | 5 ---- include/configs/stm32h743-eval.h | 5 ---- include/configs/stm32h750-art-pi.h | 5 ---- include/configs/stm32mp1.h | 5 ---- include/configs/sunxi-common.h | 5 ---- include/configs/tam3517-common.h | 5 ---- include/configs/taurus.h | 3 -- include/configs/tec-ng.h | 5 ---- include/configs/tegra-common.h | 2 -- include/configs/ti814x_evm.h | 4 --- include/configs/ti_armv7_common.h | 5 ---- include/configs/turris_mox.h | 9 ------ include/configs/usb_a9263.h | 4 --- include/configs/vexpress_common.h | 4 --- include/configs/vf610twr.h | 3 -- include/configs/work_92105.h | 3 -- include/configs/zmx25.h | 4 --- 153 files changed, 114 insertions(+), 569 deletions(-)
arch/arm/Kconfig +29 -0
@@ -1891,6 +1891,35 @@ config TARGET_XENGUEST_ARM64 select SSCANF endchoice +config SUPPORT_PASSING_ATAGS + bool "Support pre-devicetree ATAG-based booting" + depends on !ARM64 + select SETUP_MEMORY_TAGS + help + Support for booting older Linux kernels, using ATAGs rather than + passing a devicetree. This is option is rarely used, and the + semantics are defined at + https://www.kernel.org/doc/Documentation/arm/Booting at section 4a. + +config CMDLINE_TAG + bool "Pass Linux kernel cmdline via ATAG" + depends on SUPPORT_PASSING_ATAGS + +config SETUP_MEMORY_TAGS + bool + +config INITRD_TAG + bool "Pass initrd starting point and size via ATAG" + depends on SUPPORT_PASSING_ATAGS + +config REVISION_TAG + bool "Pass system revision via ATAG" + depends on SUPPORT_PASSING_ATAGS + +config SERIAL_TAG + bool "Pass system serial number via ATAG" + depends on SUPPORT_PASSING_ATAGS + config ARCH_SUPPORT_TFABOOT bool
board/CarMediaLab/flea3/flea3.c +2 -0
@@ -196,12 +196,14 @@ int board_init(void)return 0 ; } +#ifdef CONFIG_REVISION_TAG u32 get_board_rev (void ) {int rev =0 ;return (get_cpu_rev () & ~(0xF <<8 )) | (rev &0xF ) <<8 ; } +#endif /* * called prior to booting kernel or by 'fdt boardsetup' command
board/Synology/common/Makefile +1 -1
@@ -2,4 +2,4 @@ # # Copyright (C) 2021 Phil Sutter <[email protected]> -obj-y += legacy.o +obj-$(SUPPORT_PASSING_ATAGS) += legacy.o
board/beckhoff/mx53cx9020/mx53cx9020.c +2 -0
@@ -48,6 +48,7 @@ static const u32 CCAT_MODE_RUN = 0x0033DC8F;DECLARE_GLOBAL_DATA_PTR ; +#ifdef CONFIG_REVISION_TAG u32 get_board_rev (void ) {struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE ;
@@ -59,6 +60,7 @@ u32 get_board_rev(void) return (get_cpu_rev() & ~(0xF << 8)) | (rev & 0xF) << 8; } +#endif /* * Set CCAT mode
board/broadcom/bcmstb/bcmstb.c +0 -5
@@ -38,11 +38,6 @@ int board_init(void)return 0 ; } -u32 get_board_rev (void ) -{ -return 0 ; -} -void reset_cpu (void ) { }
board/compulab/cm_fx6/cm_fx6.c +2 -0
@@ -720,10 +720,12 @@ int dram_init(void)return 0 ; } +#ifdef CONFIG_REVISION_TAG u32 get_board_rev (void ) {return cl_eeprom_get_board_rev (CONFIG_SYS_I2C_EEPROM_BUS ); } +#endif static struct mxc_serial_plat cm_fx6_mxc_serial_plat = { .reg = (struct mxc_uart *)UART4_BASE ,
board/davinci/da8xxevm/da850evm.c +2 -0
@@ -267,6 +267,7 @@ const int lpsc_size = ARRAY_SIZE(lpsc);#define REV_AM18X_EVM 0x100 +#ifdef CONFIG_REVISION_TAG /* * get_board_rev() - setup to pass kernel board revision information * Returns:
@@ -294,6 +295,7 @@ u32 get_board_rev(void) rev =1 ; return rev; } +#endif int board_early_init_f (void ) {
board/davinci/da8xxevm/omapl138_lcdk.c +0 -14
@@ -143,20 +143,6 @@ const int lpsc_size = ARRAY_SIZE(lpsc);#define CONFIG_DA850_EVM_MAX_CPU_CLK 456000000#endif -/* -* get_board_rev() - setup to pass kernel board revision information -* Returns: -* bit[0-3] Maximum cpu clock rate supported by onboard SoC -* 0000b - 300 MHz -* 0001b - 372 MHz -* 0010b - 408 MHz -* 0011b - 456 MHz -*/ -u32 get_board_rev (void ) -{ -return 0 ; -} -int board_early_init_f (void ) {/*
board/freescale/imxrt1020-evk/imxrt1020-evk.c +0 -5
@@ -71,11 +71,6 @@ u32 spl_boot_device(void) }#endif -u32 get_board_rev (void ) -{ -return 0 ; -} -int board_init (void ) { gd->bd->bi_boot_params = gd->bd->bi_dram[0 ].start +0x100 ;
board/freescale/imxrt1050-evk/imxrt1050-evk.c +0 -5
@@ -71,11 +71,6 @@ u32 spl_boot_device(void) }#endif -u32 get_board_rev (void ) -{ -return 0 ; -} -int board_init (void ) { gd->bd->bi_boot_params = gd->bd->bi_dram[0 ].start +0x100 ;
board/freescale/mx51evk/mx51evk.c +2 -0
@@ -35,6 +35,7 @@ int dram_init(void)return 0 ; } +#ifdef CONFIG_REVISION_TAG u32 get_board_rev (void ) {u32 rev =get_cpu_rev ();
@@ -42,6 +43,7 @@ u32 get_board_rev(void) rev |=BOARD_REV_2_0 <<BOARD_VER_OFFSET ; return rev; } +#endif #define UART_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_PUS_100K_DOWN | PAD_CTL_DSE_HIGH)
board/freescale/mx53loco/mx53loco.c +2 -0
@@ -32,6 +32,7 @@DECLARE_GLOBAL_DATA_PTR ; +#ifdef CONFIG_REVISION_TAG u32 get_board_rev (void ) {struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE ;
@@ -46,6 +47,7 @@ u32 get_board_rev(void) return (get_cpu_rev() & ~(0xF << 8)) | (rev & 0xF) << 8; } +#endif #define UART_PAD_CTRL (PAD_CTL_HYS | PAD_CTL_DSE_HIGH | \ PAD_CTL_PUS_100K_UP | PAD_CTL_ODE)
board/freescale/mx6sabreauto/mx6sabreauto.c +2 -0
@@ -321,12 +321,14 @@ static void setup_gpmi_nand(void) }#endif +#ifdef CONFIG_REVISION_TAG u32 get_board_rev (void ) {int rev =nxp_board_rev ();return (get_cpu_rev () & ~(0xF <<8 )) | rev; } +#endif static int ar8031_phy_fixup (struct phy_device *phydev) {
board/friendlyarm/nanopi2/board.c +4 -4
@@ -295,12 +295,12 @@ static void set_ether_addr(void)env_set ("ethaddr" , ethaddr); } -#ifdef CONFIG_REVISION_TAG +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG static void set_board_rev (void ) {char info[64 ] = {0 , }; -snprintf (info,ARRAY_SIZE (info),"%02x" ,get_board_rev ()); +snprintf (info,ARRAY_SIZE (info),"%02x" ,get_board_revision ());env_set ("board_rev" , info); }#endif
@@ -310,7 +310,7 @@ static void set_dtb_name(void)char info[64 ] = {0 , };snprintf (info,ARRAY_SIZE (info), -"s5p4418-nanopi2-rev%02x.dtb" ,get_board_rev ()); +"s5p4418-nanopi2-rev%02x.dtb" ,get_board_revision ());env_set ("dtb_name" , info); }
@@ -436,7 +436,7 @@ int board_late_init(void) {bd_update_env (); -#ifdef CONFIG_REVISION_TAG +#ifdef CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG set_board_rev ();#endif set_dtb_name ();
board/friendlyarm/nanopi2/hwrev.c +8 -1
@@ -80,11 +80,18 @@ void bd_base_rev_init(void) }/* To override __weak symbols */ -u32 get_board_rev (void ) +u32 get_board_revision (void ) {return (base_rev <<8 ) | pcb_rev; } +#ifdef CONFIG_REVISION_TAG +u32 get_board_rev (void ) +{ +return get_board_revision (); +} +#endif +const char *get_board_name (void ) {bd_hwrev_init ();
board/friendlyarm/nanopi2/hwrev.h +1 -1
@@ -9,7 +9,7 @@extern void bd_hwrev_init (void );extern void bd_base_rev_init (void ); -extern u32 get_board_rev (void ); +extern u32 get_board_revision (void );extern const char *get_board_name (void );#endif /* __BD_HW_REV_H__ */
board/ge/mx53ppd/mx53ppd.c +2 -0
@@ -81,10 +81,12 @@ int dram_init_banksize(void)return 0 ; } +#ifdef CONFIG_REVISION_TAG u32 get_board_rev (void ) {return get_cpu_rev () & ~(0xF <<8 ); } +#endif #ifdef CONFIG_USB_EHCI_MX5 int board_ehci_hcd_init (int port)
board/inversepath/usbarmory/usbarmory.c +2 -0
@@ -27,6 +27,7 @@DECLARE_GLOBAL_DATA_PTR ; +#ifdef CONFIG_REVISION_TAG u32 get_board_rev (void ) {struct iim_regs *iim = (struct iim_regs *)IMX_IIM_BASE ;
@@ -38,6 +39,7 @@ u32 get_board_rev(void)return (get_cpu_rev () & ~(0xF <<8 )) | (rev &0xF ) <<8 ; } +#endif struct fsl_esdhc_cfg esdhc_cfg[1 ] = { {MMC_SDHC1_BASE_ADDR }
board/lg/sniper/sniper.c +2 -0
@@ -156,11 +156,13 @@ int misc_init_r(void)return 0 ; } +#ifdef CONFIG_REVISION_TAG u32 get_board_rev (void ) {/* Sold devices are expected to be at least revision F. */ return 6 ; } +#endif void get_board_serial (struct tag_serialnr *serialnr) {
board/nokia/rx51/rx51.c +2 -0
@@ -241,6 +241,7 @@ int board_init(void)return 0 ; } +#ifdef CONFIG_REVISION_TAG /* * Routine: get_board_revision * Description: Return board revision.
@@ -249,6 +250,7 @@ u32 get_board_rev(void) {return simple_strtol (hw_build_ptr,NULL ,16 ); } +#endif /* * Routine: setup_board_tags
board/raspberrypi/rpi/rpi.c +2 -2
@@ -419,7 +419,7 @@ int misc_init_r(void)return 0 ; } -static void get_board_rev (void ) +static void get_board_revision (void ) { ALLOC_CACHE_ALIGN_BUFFER(struct msg_get_board_rev, msg, 1);int ret;
@@ -478,7 +478,7 @@ int board_init(void)hw_watchdog_init ();#endif -get_board_rev (); +get_board_revision (); gd->bd->bi_boot_params =0x100 ;
board/samsung/common/exynos5-dt-types.c +14 -12
@@ -47,18 +47,6 @@ struct odroid_rev_info odroid_info[] = { { EXYNOS5_BOARD_ODROID_UNKNOWN, 0, 4095, "unknown" }, }; -static unsigned int odroid_get_rev (void ) -{ -int i; - -for (i =0 ; i <ARRAY_SIZE (odroid_info); i++) { -if (odroid_info[i].board_type == gd->board_type) -return odroid_info[i].board_rev; - } - -return 0 ; -} -/* * Read ADC at least twice and check the resuls. If regulator providing voltage * on to measured point was just turned on, first reads might require time
@@ -200,6 +188,19 @@ bool board_is_generic(void)return false; } +#ifdef CONFIG_REVISION_TAG +static unsigned int odroid_get_rev (void ) +{ +int i; + +for (i =0 ; i <ARRAY_SIZE (odroid_info); i++) { +if (odroid_info[i].board_type == gd->board_type) +return odroid_info[i].board_rev; + } + +return 0 ; +} +/** * get_board_rev() - return detected board revision. *
@@ -212,6 +213,7 @@ u32 get_board_rev(void) return odroid_get_rev(); } +#endif /** * get_board_type() - returns board type string.
board/samsung/goni/goni.c +0 -5
@@ -24,11 +24,6 @@DECLARE_GLOBAL_DATA_PTR ; -u32 get_board_rev (void ) -{ -return 0 ; -} -int board_init (void ) {/* Set Initial global variables */
board/samsung/origen/origen.c +0 -5
@@ -12,11 +12,6 @@#include <asm/arch/pinmux.h> #include <usb.h> -u32 get_board_rev (void ) -{ -return 0 ; -} -int exynos_init (void ) {return 0 ;
board/samsung/trats2/trats2.c +2 -0
@@ -67,10 +67,12 @@ static void check_hw_revision(void) board_rev = modelrev <<8 ; } +#ifdef CONFIG_REVISION_TAG u32 get_board_rev (void ) {return board_rev; } +#endif static inline u32 get_model_rev (void ) {
board/samsung/universal_c210/universal.c +2 -0
@@ -33,10 +33,12 @@ DECLARE_GLOBAL_DATA_PTR;unsigned int board_rev;static int init_pmic_lcd (void ); +#ifdef CONFIG_REVISION_TAG u32 get_board_rev (void ) {return board_rev; } +#endif int exynos_power_init (void ) {
board/st/stm32f429-discovery/stm32f429-discovery.c +0 -5
@@ -46,11 +46,6 @@ int dram_init_banksize(void)return 0 ; } -u32 get_board_rev (void ) -{ -return 0 ; -} -int board_init (void ) { gd->bd->bi_boot_params = gd->bd->bi_dram[0 ].start +0x100 ;
board/st/stm32f429-evaluation/stm32f429-evaluation.c +0 -5
@@ -40,11 +40,6 @@ int dram_init_banksize(void)return 0 ; } -u32 get_board_rev (void ) -{ -return 0 ; -} -int board_init (void ) { gd->bd->bi_boot_params = gd->bd->bi_dram[0 ].start +0x100 ;
board/st/stm32f469-discovery/stm32f469-discovery.c +0 -5
@@ -40,11 +40,6 @@ int dram_init_banksize(void)return 0 ; } -u32 get_board_rev (void ) -{ -return 0 ; -} -int board_init (void ) { gd->bd->bi_boot_params = gd->bd->bi_dram[0 ].start +0x100 ;
board/st/stm32f746-disco/stm32f746-disco.c +0 -5
@@ -77,12 +77,7 @@ u32 spl_boot_device(void) {return BOOT_DEVICE_XIP ; } -#endif -u32 get_board_rev (void ) -{ -return 0 ; -}int board_late_init (void ) {
board/st/stm32h743-disco/stm32h743-disco.c +0 -5
@@ -36,11 +36,6 @@ int dram_init_banksize(void)return 0 ; } -u32 get_board_rev (void ) -{ -return 0 ; -} -int board_init (void ) { gd->bd->bi_boot_params = gd->bd->bi_dram[0 ].start +0x100 ;
board/st/stm32h743-eval/stm32h743-eval.c +0 -5
@@ -36,11 +36,6 @@ int dram_init_banksize(void)return 0 ; } -u32 get_board_rev (void ) -{ -return 0 ; -} -int board_init (void ) { gd->bd->bi_boot_params = gd->bd->bi_dram[0 ].start +0x100 ;
board/st/stm32h750-art-pi/stm32h750-art-pi.c +0 -5
@@ -41,11 +41,6 @@ int board_early_init_f(void)return 0 ; } -u32 get_board_rev (void ) -{ -return 0 ; -} -int board_late_init (void ) {return 0 ;
board/ti/panda/panda.c +2 -0
@@ -312,6 +312,7 @@ void board_mmc_power_init(void)#endif #endif +#ifdef CONFIG_REVISION_TAG /* * get_board_rev() - get board revision */
@@ -319,3 +320,4 @@ u32 get_board_rev(void) {return 0x20 ; } +#endif
board/ti/sdp4430/sdp.c +2 -0
@@ -104,6 +104,7 @@ int spl_start_uboot(void) }#endif /* CONFIG_SPL_OS_BOOT */ +#ifdef CONFIG_REVISION_TAG /* * get_board_rev() - get board revision */
@@ -111,3 +112,4 @@ u32 get_board_rev(void) {return 0x20 ; } +#endif
board/toradex/apalis_imx6/apalis_imx6.c +2 -3
@@ -707,12 +707,11 @@ int board_init(void)#ifdef CONFIG_BOARD_LATE_INIT int board_late_init (void ) { -#if defined(CONFIG_REVISION_TAG ) && \ - defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG ) +#if defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG )char env_str[256 ];u32 rev; - rev =get_board_rev (); + rev =get_board_revision ();snprintf (env_str,ARRAY_SIZE (env_str),"%.4x" , rev);env_set ("board_rev" , env_str);
board/toradex/colibri_imx6/colibri_imx6.c +2 -3
@@ -611,12 +611,11 @@ int board_init(void)#ifdef CONFIG_BOARD_LATE_INIT int board_late_init (void ) { -#if defined(CONFIG_REVISION_TAG ) && \ - defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG ) +#if defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG )char env_str[256 ];u32 rev; - rev =get_board_rev (); + rev =get_board_revision ();snprintf (env_str,ARRAY_SIZE (env_str),"%.4x" , rev);env_set ("board_rev" , env_str);#endif
board/toradex/common/tdx-common.c +4 -4
@@ -32,8 +32,8 @@ static char tdx_car_rev_str[6];static char *tdx_carrier_board_name;#endif -#ifdef CONFIG_REVISION_TAG -u32 get_board_rev (void ) +#if defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG ) +u32 get_board_revision (void ) {/* Check validity */ if (!tdx_hw_tag.ver_major)
@@ -183,8 +183,8 @@ int ft_common_board_setup(void *blob, struct bd_info *bd)#else /* CONFIG_TDX_CFG_BLOCK */ -#ifdef CONFIG_REVISION_TAG -u32 get_board_rev (void ) +#if defined(CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG ) +u32 get_board_revision (void ) {return 0 ; }
board/toradex/common/tdx-common.h +1 -0
@@ -10,6 +10,7 @@#define TDX_USB_VID 0x1B67int ft_common_board_setup (void *blob,struct bd_info *bd); +u32 get_board_revision (void );#if defined(CONFIG_DM_VIDEO )int show_boot_logo (void );
configs/icnova-a20-swac_defconfig +4 -0
@@ -1,5 +1,9 @@ CONFIG_ARM=y CONFIG_ARCH_SUNXI=y +CONFIG_SUPPORT_PASSING_ATAGS=y +CONFIG_CMDLINE_TAG=y +CONFIG_INITRD_TAG=y +CONFIG_SERIAL_TAG=y CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-swac" CONFIG_SPL=y CONFIG_MACH_SUN7I=y
configs/nokia_rx51_defconfig +4 -0
@@ -1,6 +1,10 @@ CONFIG_ARM=y # CONFIG_SYS_THUMB_BUILD is not set CONFIG_ARCH_OMAP2PLUS=y +CONFIG_SUPPORT_PASSING_ATAGS=y +CONFIG_CMDLINE_TAG=y +CONFIG_INITRD_TAG=y +CONFIG_REVISION_TAG=y CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NOKIA_RX51=y
configs/sandbox_defconfig +1 -3
@@ -120,8 +120,6 @@ CONFIG_BOOTP_SEND_HOSTNAME=y CONFIG_NETCONSOLE=y CONFIG_IP_DEFRAG=y CONFIG_DM_DMA=y -CONFIG_REGMAP=y -CONFIG_SYSCON=y CONFIG_DEVRES=y CONFIG_DEBUG_DEVRES=y CONFIG_SIMPLE_PM_BUS=y
@@ -131,9 +129,9 @@ CONFIG_AXI=y CONFIG_AXI_SANDBOX=y CONFIG_BOOTCOUNT_LIMIT=y CONFIG_DM_BOOTCOUNT=y -CONFIG_DM_BOOTCOUNT_SYSCON=y CONFIG_DM_BOOTCOUNT_RTC=y CONFIG_DM_BOOTCOUNT_I2C_EEPROM=y +CONFIG_DM_BOOTCOUNT_SYSCON=y CONFIG_BUTTON=y CONFIG_BUTTON_ADC=y CONFIG_BUTTON_GPIO=y
configs/socfpga_n5x_atf_defconfig +2 -3
@@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x200 -CONFIG_SYS_SPI_U_BOOT_OFFS=0x02000000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_n5x_socdk" CONFIG_SPL_TEXT_BASE=0xFFE00000
@@ -26,6 +25,7 @@ CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run mmcfitboot" CONFIG_SPL_CRC32=y CONFIG_SPL_CACHE=y CONFIG_SPL_SPI_LOAD=y +CONFIG_SYS_SPI_U_BOOT_OFFS=0x02000000 CONFIG_SPL_ATF=y CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_HUSH_PARSER=y
@@ -36,6 +36,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y +CONFIG_CMD_WDT=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y
@@ -43,11 +44,9 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y -CONFIG_CMD_WDT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y -CONFIG_SPL_ALTERA_SDRAM=y CONFIG_DWAPB_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_DW=y
configs/socfpga_n5x_defconfig +2 -3
@@ -5,7 +5,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x200 -CONFIG_SYS_SPI_U_BOOT_OFFS=0x3c00000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_n5x_socdk" CONFIG_SPL_TEXT_BASE=0xFFE00000
@@ -20,6 +19,7 @@ CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run fatscript; run mmcload; run linux_qspi_enable; run mmcboot" CONFIG_SPL_CACHE=y CONFIG_SPL_SPI_LOAD=y +CONFIG_SYS_SPI_U_BOOT_OFFS=0x3c00000 CONFIG_HUSH_PARSER=y CONFIG_SYS_PROMPT="SOCFPGA_N5X # " CONFIG_CMD_MEMTEST=y
@@ -28,6 +28,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y +CONFIG_CMD_WDT=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y
@@ -35,11 +36,9 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y -CONFIG_CMD_WDT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y -CONFIG_SPL_ALTERA_SDRAM=y CONFIG_DWAPB_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_DW=y
configs/socfpga_n5x_vab_defconfig +2 -3
@@ -6,7 +6,6 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000 CONFIG_NR_DRAM_BANKS=2 CONFIG_ENV_SIZE=0x1000 CONFIG_ENV_OFFSET=0x200 -CONFIG_SYS_SPI_U_BOOT_OFFS=0x02000000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="socfpga_n5x_socdk" CONFIG_SPL_TEXT_BASE=0xFFE00000
@@ -27,6 +26,7 @@ CONFIG_BOOTCOMMAND="run fatscript; run mmcfitload; run mmcfitboot" CONFIG_SPL_CRC32=y CONFIG_SPL_CACHE=y CONFIG_SPL_SPI_LOAD=y +CONFIG_SYS_SPI_U_BOOT_OFFS=0x02000000 CONFIG_SPL_ATF=y CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_HUSH_PARSER=y
@@ -37,6 +37,7 @@ CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y +CONFIG_CMD_WDT=y CONFIG_CMD_DHCP=y CONFIG_CMD_MII=y CONFIG_CMD_PING=y
@@ -44,11 +45,9 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4=y CONFIG_CMD_FAT=y CONFIG_CMD_FS_GENERIC=y -CONFIG_CMD_WDT=y CONFIG_ENV_IS_IN_MMC=y CONFIG_NET_RANDOM_ETHADDR=y CONFIG_SPL_DM_SEQ_ALIAS=y -CONFIG_SPL_ALTERA_SDRAM=y CONFIG_DWAPB_GPIO=y CONFIG_DM_I2C=y CONFIG_SYS_I2C_DW=y
configs/xilinx_zynqmp_virt_defconfig +1 -1
@@ -5,7 +5,6 @@ CONFIG_SYS_TEXT_BASE=0x8000000 CONFIG_SYS_MALLOC_F_LEN=0x8000 CONFIG_SYS_MEMTEST_START=0x00000000 CONFIG_SYS_MEMTEST_END=0x00001000 -CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_DM_GPIO=y CONFIG_DEFAULT_DEVICE_TREE="zynqmp-zcu100-revC" CONFIG_SPL_STACK_R_ADDR=0x18000000
@@ -35,6 +34,7 @@ CONFIG_SPL_OS_BOOT=y CONFIG_SPL_RAM_SUPPORT=y CONFIG_SPL_RAM_DEVICE=y CONFIG_SPL_SPI_LOAD=y +CONFIG_SYS_SPI_U_BOOT_OFFS=0x100000 CONFIG_SPL_ATF=y CONFIG_SPL_ATF_NO_PLATFORM_PARAM=y CONFIG_CMD_BOOTMENU=y
include/configs/SBx81LIFKW.h +0 -14
@@ -38,15 +38,6 @@* for your console driver. */ -/* -* For booting Linux, the board info and command line data -* have to be in the first 8 MB of memory, since this is -* the maximum mapped by the Linux kernel during initialization. -*/ -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG 1/* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS 1/* enable memory tag */ -#define MTDPARTS_DEFAULT "mtdparts=spi0.0:768K(boot)ro,256K(boot-env),14M(user),1M(errlog)"#define MTDPARTS_MTDOOPS "errlog"#define CONFIG_DOS_PARTITION
@@ -62,11 +53,6 @@#define CONFIG_SYS_MONITOR_LEN (256 << 10)/* Reserve 256 kB for monitor */ #define CONFIG_SYS_MALLOC_LEN (4 << 20)/* Reserve 4.0 MB for malloc */ -/* -* For booting Linux, the board info and command line data -* have to be in the first 8 MB of memory, since this is -* the maximum mapped by the Linux kernel during initialization. -*/ #define CONFIG_SYS_BOOTMAPSZ (8 << 20)/* Initial Mem map for Linux*/ /* size in bytes reserved for initial data */
include/configs/SBx81LIFXCAT.h +0 -9
@@ -38,15 +38,6 @@* for your console driver. */ -/* -* For booting Linux, the board info and command line data -* have to be in the first 8 MB of memory, since this is -* the maximum mapped by the Linux kernel during initialization. -*/ -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG 1/* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS 1/* enable memory tag */ -#define MTDPARTS_DEFAULT "mtdparts=spi0.0:768K(boot)ro,256K(boot-env),14M(user),1M(errlog)"#define MTDPARTS_MTDOOPS "errlog"#define CONFIG_DOS_PARTITION
include/configs/am3517_evm.h +0 -2
@@ -14,8 +14,6 @@#include <configs/ti_omap3_common.h> -#define CONFIG_REVISION_TAG -/* Hardware drivers */ /*
include/configs/apalis_imx6.h +0 -5
@@ -23,11 +23,6 @@#include "imx6_spl.h" #endif -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024)
include/configs/aspeed-common.h +0 -3
@@ -13,9 +13,6 @@#include <asm/arch/platform.h> /* Misc CPU related */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_SYS_SDRAM_BASE ASPEED_DRAM_BASE
include/configs/at91sam9260ek.h +0 -3
@@ -35,9 +35,6 @@#endif /* Misc CPU related */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_SKIP_LOWLEVEL_INIT /* general purpose I/O */
include/configs/at91sam9261ek.h +0 -4
@@ -22,10 +22,6 @@#include <asm/hardware.h> -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_ATMEL_LEGACY
include/configs/at91sam9263ek.h +0 -4
@@ -22,10 +22,6 @@#define CONFIG_SYS_AT91_MAIN_CLOCK 16367660/* 16.367 MHz crystal */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#ifndef CONFIG_SYS_USE_BOOT_NORFLASH #define CONFIG_SKIP_LOWLEVEL_INIT #else
include/configs/at91sam9m10g45ek.h +0 -3
@@ -18,9 +18,6 @@#define CONFIG_AT91SAM9M10G45EK -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_SKIP_LOWLEVEL_INIT /* general purpose I/O */
include/configs/at91sam9n12ek.h +0 -3
@@ -14,9 +14,6 @@#define CONFIG_SYS_AT91_MAIN_CLOCK 16000000/* main clock xtal */ /* Misc CPU related */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_SKIP_LOWLEVEL_INIT /* LCD */
include/configs/at91sam9rlek.h +0 -4
@@ -18,10 +18,6 @@#define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#define CONFIG_ATMEL_LEGACY /*
include/configs/at91sam9x5ek.h +0 -3
@@ -12,9 +12,6 @@#define CONFIG_SYS_AT91_SLOW_CLOCK 32768#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_SKIP_LOWLEVEL_INIT /* general purpose I/O */
include/configs/bcmstb.h +0 -1
@@ -121,7 +121,6 @@ extern phys_addr_t prior_stage_fdt_address;/* * Informational display configuration. */ -#define CONFIG_REVISION_TAG /* * Command configuration.
include/configs/bk4r1.h +0 -3
@@ -62,9 +62,6 @@#define CONFIG_SKIP_LOWLEVEL_INIT -/* Enable passing of ATAGs */ -#define CONFIG_CMDLINE_TAG -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 4 * SZ_1M)
include/configs/brppt1.h +0 -4
@@ -25,10 +25,6 @@#define CONFIG_POWER_TPS65217 -/* Support both device trees and ATAGs. */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG /*#define CONFIG_MACH_TYPE 3589*/ #define CONFIG_MACH_TYPE 0xFFFFFFFF/* TODO: check with kernel*/
include/configs/brppt2.h +0 -3
@@ -27,9 +27,6 @@#define CONFIG_FSL_USDHC /* Boot */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_MACH_TYPE 0xFFFFFFFF/* misc */
include/configs/brsmarc1.h +0 -5
@@ -61,11 +61,6 @@ BUR_COMMON_ENV \ " bootm ${loadaddr} - ${dtbaddr}\0"#endif /* !CONFIG_SPL_BUILD*/ -/* Support both device trees and ATAGs. */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -/* SPI Flash */ /* Environment */
include/configs/brxre1.h +0 -5
@@ -58,11 +58,6 @@ BUR_COMMON_ENV \#define CONFIG_BOOTCOMMAND "mmc dev 1; run b_default" -/* Support both device trees and ATAGs. */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -/* Environment */ #endif /* __CONFIG_BRXRE1_H__ */
include/configs/colibri_imx6.h +0 -5
@@ -21,11 +21,6 @@#include "imx6_spl.h" #endif -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024)
include/configs/colibri_pxa270.h +0 -2
@@ -29,8 +29,6 @@"fi; " \"bootm 0xc0000;" #define CONFIG_TIMESTAMP -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS /* * Serial Console Configuration
include/configs/corvus.h +0 -3
@@ -29,9 +29,6 @@#define CONFIG_SYS_AT91_SLOW_CLOCK 32768#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* from 12 MHz crystal */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY /* general purpose I/O */
include/configs/da850evm.h +0 -3
@@ -180,9 +180,6 @@*/ #define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100)#define CONFIG_HWCONFIG /* enable hwconfig */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTCOMMAND \ "run envboot; " \
include/configs/devkit3250.h +0 -6
@@ -125,12 +125,6 @@* U-Boot Commands */ -/* -* Boot Linux -*/ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_BOOTFILE "uImage"#define CONFIG_LOADADDR 0x80008000
include/configs/devkit8000.h +0 -2
@@ -34,8 +34,6 @@#include <configs/ti_omap3_common.h> -#define CONFIG_REVISION_TAG 1 -/* Size of malloc() pool */ #undef CONFIG_SYS_MALLOC_LEN#define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10))
include/configs/dh_imx6.h +0 -5
@@ -27,11 +27,6 @@/* Miscellaneous configurable options */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (4 * SZ_1M)
include/configs/display5.h +0 -5
@@ -47,11 +47,6 @@#include "imx6_spl.h" -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024)
include/configs/edminiv2.h +0 -9
@@ -94,15 +94,6 @@/* auto boot */ -/* -* For booting Linux, the board info and command line data -* have to be in the first 8 MB of memory, since this is -* the maximum mapped by the Linux kernel during initialization. -*/ -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG 1/* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS 1/* enable memory tag */ -#define CONFIG_SYS_CBSIZE 1024/* Console I/O Buff Size */ /*
include/configs/ethernut5.h +0 -3
@@ -131,9 +131,6 @@/* File systems */ /* Boot command */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_BOOTCOMMAND "sf probe 0:0; " \ "sf read 0x22000000 0xc6000 0x294000; " \ "bootm 0x22000000"
include/configs/exynos-common.h +0 -4
@@ -24,10 +24,6 @@#define CONFIG_SYS_CLK_FREQ 24000000#define COUNTER_FREQUENCY CONFIG_SYS_CLK_FREQ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG -#define CONFIG_INITRD_TAG -/* Size of malloc() pool before and after relocation */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20))
include/configs/exynos4-common.h +0 -2
@@ -14,8 +14,6 @@#define CONFIG_BOARD_COMMON -#define CONFIG_REVISION_TAG -/* SD/MMC configuration */ #define CONFIG_MMC_DEFAULT_DEV 0
include/configs/flea3.h +0 -5
@@ -23,11 +23,6 @@/* This is required to setup the ESDC controller */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -/* * Size of malloc() pool */
include/configs/ge_bx50v3.h +0 -4
@@ -19,10 +19,6 @@#include "mx6_common.h" #include <linux/sizes.h> -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)/* SATA Configs */
include/configs/grpeach.h +0 -1
@@ -13,7 +13,6 @@/* Miscellaneous */ #define CONFIG_SYS_PBSIZE 256 -#define CONFIG_CMDLINE_TAG /* Internal RAM Size (RZ/A1=3M, RZ/A1M=5M, RZ/A1H=10M) */ #define CONFIG_SYS_SDRAM_BASE 0x20000000
include/configs/imx27lite-common.h +0 -4
@@ -15,10 +15,6 @@#define CONFIG_MX27 #define CONFIG_MX27_CLK32 32768/* OSC32K frequency */ -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -/* * Lowlevel configuration */
include/configs/integrator-common.h +0 -3
@@ -10,9 +10,6 @@#define CONFIG_SYS_LOAD_ADDR 0x7fc0/* default load address */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 128*1024)/* Size of malloc() pool */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -/* * There are various dependencies on the core module (CM) fitted * Users should refer to their CM user guide
include/configs/km/km_arm.h +0 -9
@@ -61,15 +61,6 @@#define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -/* -* For booting Linux, the board info and command line data -* have to be in the first 8 MB of memory, since this is -* the maximum mapped by the Linux kernel during initialization. -*/ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG /* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */ -/* * NAND Flash configuration */
include/configs/kp_imx6q_tpc.h +0 -4
@@ -16,10 +16,6 @@#include "imx6_spl.h" /* common IMX6 SPL configuration */ /* Miscellaneous configurable options */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (4 * SZ_1M)
include/configs/kzm9g.h +0 -4
@@ -12,10 +12,6 @@#include <asm/arch/rmobile.h> -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -/* MEMORY */ #define KZM_SDRAM_BASE (0x40000000)#define PHYS_SDRAM KZM_SDRAM_BASE
include/configs/legoev3.h +0 -2
@@ -64,8 +64,6 @@*/ #define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100)#define CONFIG_HWCONFIG /* enable hwconfig */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_SETUP_INITRD_TAG #define CONFIG_BOOTCOMMAND \ "if mmc rescan; then " \
include/configs/ls1021aiot.h +0 -2
@@ -175,8 +175,6 @@#define CONFIG_PCI_SCAN_SHOW #endif -#define CONFIG_CMDLINE_TAG -#define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_LAYERSCAPE_NS_ACCESS #define CONFIG_SMP_PEN_ADDR 0x01ee0200
include/configs/ls1021aqds.h +0 -2
@@ -429,8 +429,6 @@ unsigned long get_board_ddr_clk(void);#define CONFIG_PCI_SCAN_SHOW #endif -#define CONFIG_CMDLINE_TAG -#define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_LAYERSCAPE_NS_ACCESS #define CONFIG_SMP_PEN_ADDR 0x01ee0200
include/configs/ls1021atwr.h +0 -2
@@ -267,8 +267,6 @@#define CONFIG_PCI_SCAN_SHOW #endif -#define CONFIG_CMDLINE_TAG -#define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_LAYERSCAPE_NS_ACCESS #define CONFIG_SMP_PEN_ADDR 0x01ee0200
include/configs/ls1043aqds.h +0 -2
@@ -395,8 +395,6 @@ unsigned long get_board_ddr_clk(void);* Environment */ -#define CONFIG_CMDLINE_TAG -#include <asm/fsl_secure_boot.h> #endif /* __LS1043AQDS_H__ */
include/configs/ls1046aqds.h +0 -2
@@ -410,8 +410,6 @@ unsigned long get_board_ddr_clk(void);* Environment */ -#define CONFIG_CMDLINE_TAG -#undef CONFIG_BOOTCOMMAND#ifdef CONFIG_TFABOOT #define IFC_NAND_BOOTCOMMAND "run distro_bootcmd; run nand_bootcmd; " \
include/configs/m53menlo.h +0 -5
@@ -11,7 +11,6 @@#include <asm/arch/imx-regs.h> -#define CONFIG_REVISION_TAG #define CONFIG_SYS_FSL_CLK #define CONFIG_TIMESTAMP /* Print image info with timestamp */
@@ -141,10 +140,6 @@/* * Boot Linux */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTFILE "boot/fitImage"#define CONFIG_LOADADDR 0x70800000#define CONFIG_BOOTCOMMAND "run mmc_mmc"
include/configs/meesc.h +0 -5
@@ -33,11 +33,6 @@/* Misc CPU related */ #define CONFIG_SKIP_LOWLEVEL_INIT -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_SERIAL_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ /* * Hardware drivers
include/configs/mt7623.h +0 -3
@@ -12,9 +12,6 @@#include <linux/sizes.h> /* Miscellaneous configurable options */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_CMDLINE_TAG #define CONFIG_SYS_MAXARGS 8#define CONFIG_SYS_BOOTM_LEN SZ_64M
include/configs/mt7629.h +0 -3
@@ -12,9 +12,6 @@#include <linux/sizes.h> /* Miscellaneous configurable options */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_CMDLINE_TAG #define CONFIG_SYS_MAXARGS 8#define CONFIG_SYS_BOOTM_LEN SZ_64M
include/configs/mv-common.h +0 -9
@@ -41,15 +41,6 @@/* auto boot */ -/* -* For booting Linux, the board info and command line data -* have to be in the first 8 MB of memory, since this is -* the maximum mapped by the Linux kernel during initialization. -*/ -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG 1/* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS 1/* enable memory tag */ -#define CONFIG_SYS_CBSIZE 1024/* Console I/O Buff Size */ /*
include/configs/mvebu_armada-37xx.h +0 -9
@@ -25,15 +25,6 @@4000000 ,4500000 ,5000000 ,5500000 , \ 6000000 } -/* -* For booting Linux, the board info and command line data -* have to be in the first 8 MB of memory, since this is -* the maximum mapped by the Linux kernel during initialization. -*/ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG /* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */ -#define CONFIG_SYS_CBSIZE 1024/* Console I/O Buff Size */ /*
include/configs/mvebu_armada-8k.h +0 -9
@@ -19,15 +19,6 @@#define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, \ 115200, 230400, 460800, 921600 } -/* -* For booting Linux, the board info and command line data -* have to be in the first 8 MB of memory, since this is -* the maximum mapped by the Linux kernel during initialization. -*/ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG /* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */ -#define CONFIG_SYS_CBSIZE 1024/* Console I/O Buff Size */ /*
include/configs/mx51evk.h +0 -5
@@ -16,11 +16,6 @@#include <asm/arch/imx-regs.h> -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_MACH_TYPE MACH_TYPE_MX51_BABBAGE/* * Size of malloc() pool
include/configs/mx53cx9020.h +0 -6
@@ -14,17 +14,11 @@#include <asm/arch/imx-regs.h> -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_SYS_FSL_CLK /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (32 * 1024 * 1024) -#define CONFIG_REVISION_TAG -#define CONFIG_MXC_UART_BASE UART2_BASE#define CONFIG_FPGA_COUNT 1
include/configs/mx53loco.h +0 -6
@@ -13,17 +13,11 @@#include <asm/arch/imx-regs.h> -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_SYS_FSL_CLK /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) -#define CONFIG_REVISION_TAG -#define CONFIG_MXC_UART_BASE UART1_BASE/* MMC Configs */
include/configs/mx53ppd.h +0 -6
@@ -11,17 +11,11 @@#include <asm/arch/imx-regs.h> -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_SYS_FSL_CLK /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024) -#define CONFIG_REVISION_TAG -/* USB Configs */ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX
include/configs/mx6_common.h +0 -6
@@ -33,12 +33,6 @@#define CONFIG_SYS_FSL_CLK -/* ATAGs */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -/* Boot options */ #if defined(CONFIG_MX6SL) || defined(CONFIG_MX6SLL) || \ defined(CONFIG_MX6SX) || \
include/configs/mx7ulp_com.h +0 -4
@@ -32,10 +32,6 @@#define CONFIG_SYS_HZ_CLOCK 1000000/* Fixed at 1MHz from TSTMR */ -#define CONFIG_INITRD_TAG -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (8 * SZ_1M)
include/configs/mx7ulp_evk.h +0 -5
@@ -22,11 +22,6 @@#define CONFIG_SYS_HZ_CLOCK 1000000/* Fixed at 1Mhz from TSTMR */ -#define CONFIG_INITRD_TAG -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -/*#define CONFIG_REVISION_TAG*/ -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (8 * SZ_1M)
include/configs/mxs.h +0 -4
@@ -85,10 +85,6 @@#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE/* Boot argument buffer size */ -/* Booting Linux */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -/* * Drivers */
include/configs/nokia_rx51.h +0 -5
@@ -36,11 +36,6 @@#define CONFIG_SKIP_LOWLEVEL_INIT /* X-Loader set everything up */ -#define CONFIG_CMDLINE_TAG /* enable passing kernel command line string */ -#define CONFIG_INITRD_TAG /* enable passing initrd */ -#define CONFIG_REVISION_TAG /* enable passing revision tag*/ -#define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */ -/* * Size of malloc() pool */
include/configs/odroid.h +0 -2
@@ -174,6 +174,4 @@*/ #define CONFIG_MISC_COMMON -#undef CONFIG_REVISION_TAG -#endif /* __CONFIG_H */
include/configs/odroid_xu3.h +0 -1
@@ -75,7 +75,6 @@/* Set soc_rev, soc_id, board_rev, board_name, fdtfile */ #define CONFIG_ODROID_REV_AIN 9 -#define CONFIG_REVISION_TAG /* * Need to override existing one (smdk5420) with odroid so set_board_info will
include/configs/omap3_beagle.h +0 -5
@@ -18,11 +18,6 @@* area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB). */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -/* NAND */ #if defined(CONFIG_MTD_RAW_NAND )#define CONFIG_SYS_FLASH_BASE NAND_BASE
include/configs/omap3_evm.h +0 -5
@@ -23,11 +23,6 @@* area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB). */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -/* NAND */ #if defined(CONFIG_MTD_RAW_NAND )#define CONFIG_SYS_FLASH_BASE NAND_BASE
include/configs/omap3_igep00x0.h +0 -2
@@ -16,8 +16,6 @@* area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB). */ -#define CONFIG_REVISION_TAG 1 -/* TPS65950 */ #define PBIASLITEVMODE1 (1 << 8)
include/configs/omap3_logic.h +0 -5
@@ -20,11 +20,6 @@* order to allow for BCH8 to fit in. */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -/* Hardware drivers */ /* I2C */
include/configs/omapl138_lcdk.h +0 -3
@@ -173,9 +173,6 @@* Linux Information */ #define LINUX_BOOT_PARAM_ADDR (PHYS_SDRAM_1 + 0x100) -#define CONFIG_CMDLINE_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_BOOTCOMMAND \ "run envboot; " \ "run mmcboot; "
include/configs/pcm052.h +0 -3
@@ -14,9 +14,6 @@#define CONFIG_SKIP_LOWLEVEL_INIT -/* Enable passing of ATAGs */ -#define CONFIG_CMDLINE_TAG -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * SZ_1M)
include/configs/pm9261.h +0 -4
@@ -128,10 +128,6 @@ AT91_WDT_MR_WDDIS | \ AT91_WDT_MR_WDD(0xfff)) -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#undef CONFIG_SKIP_LOWLEVEL_INIT/*
include/configs/pm9263.h +0 -4
@@ -140,10 +140,6 @@ AT91_WDT_MR_WDDIS | \ AT91_WDT_MR_WDD(0xfff)) -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 -#undef CONFIG_SKIP_LOWLEVEL_INIT#define CONFIG_USER_LOWLEVEL_INIT 1
include/configs/pm9g45.h +0 -3
@@ -19,9 +19,6 @@#define CONFIG_SYS_AT91_SLOW_CLOCK 32768#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* from 12 MHz crystal */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_SKIP_LOWLEVEL_INIT /* general purpose I/O */
include/configs/rcar-gen2-common.h +0 -4
@@ -10,10 +10,6 @@#include <asm/arch/rmobile.h> -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#ifdef CONFIG_SPL #define CONFIG_SPL_TARGET "spl/u-boot-spl.srec"#endif
include/configs/rcar-gen3-common.h +0 -4
@@ -21,10 +21,6 @@/* boot option */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -/* Generic Interrupt Controller Definitions */ #define CONFIG_GICV2 #define GICD_BASE 0xF1010000
include/configs/rpi.h +0 -5
@@ -92,11 +92,6 @@/* Shell */ -/* ATAGs support for bootm/bootz */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG -#define CONFIG_INITRD_TAG -/* Environment */ #define ENV_DEVICE_SETTINGS \ "stdin=serial,usbkbd\0" \
include/configs/s5p_goni.h +0 -5
@@ -26,11 +26,6 @@/* Text Base */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_INITRD_TAG -/* Size of malloc() pool before and after relocation */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (80 << 20))
include/configs/sam9x60ek.h +0 -3
@@ -14,9 +14,6 @@#define CONFIG_SYS_AT91_SLOW_CLOCK 32768#define CONFIG_SYS_AT91_MAIN_CLOCK 24000000/* 24 MHz crystal */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_USART_BASE ATMEL_BASE_DBGU
include/configs/siemens-am33x-common.h +0 -4
@@ -23,10 +23,6 @@#define CONFIG_MACH_TYPE CONFIG_SIEMENS_MACH_TYPE#endif -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -/* commands to include */ #ifndef CONFIG_SPL_BUILD
include/configs/smartweb.h +0 -3
@@ -40,9 +40,6 @@#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* 18.432MHz crystal */ /* misc settings */ -#define CONFIG_CMDLINE_TAG /* pass commandline to Kernel */ -#define CONFIG_SETUP_MEMORY_TAGS /* pass memory defs to kernel */ -#define CONFIG_INITRD_TAG /* pass initrd param to kernel */ #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY /* U-Boot is loaded by a bootloader */ /* We set the max number of command args high to avoid HUSH bugs. */
include/configs/smdkc100.h +0 -4
@@ -29,10 +29,6 @@/* Text Base */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG -#define CONFIG_INITRD_TAG -/* * Size of malloc() pool * 1MB = 0x100000, 0x100000 = 1024 * 1024
include/configs/smdkv310.h +0 -1
@@ -12,7 +12,6 @@#undef CONFIG_BOARD_COMMON#undef CONFIG_USB_GADGET_DWC2_OTG_PHY -#undef CONFIG_REVISION_TAG/* High Level Configuration Options */ #define CONFIG_EXYNOS4210 1/* which is a EXYNOS4210 SoC */
include/configs/snapper9260.h +0 -3
@@ -20,9 +20,6 @@/* CPU */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_SKIP_LOWLEVEL_INIT /* SDRAM */
include/configs/snapper9g45.h +0 -3
@@ -19,9 +19,6 @@#define CONFIG_SYS_AT91_SLOW_CLOCK 32768/* CPU */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY /* SDRAM */
include/configs/sniper.h +0 -10
@@ -111,16 +111,6 @@"bootfile=/boot/extlinux/extlinux.conf\0" \"bootargs=console=ttyO2,115200 vram=5M,0x9FA00000 omapfb.vram=0:5M\0" -/* -* ATAGs - */ - -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SERIAL_TAG -/* * Boot */
include/configs/socfpga_arria5_secu1.h +0 -1
@@ -43,7 +43,6 @@"setenv altbootcmd 'setenv bootnum b && saveenv && boot;' && " \"saveenv && saveenv && boot;" -#define CONFIG_CMDLINE_TAG #define CONFIG_SYS_BOOTM_LEN (64 << 20)/* Environment settings */
include/configs/stemmy.h +0 -3
@@ -23,7 +23,4 @@#define CONFIG_SYS_L2_PL310 #define CONFIG_SYS_PL310_BASE 0xa0412000 -/* Generate initrd atag for downstream kernel (others are copied in stemmy.c) */ -#define CONFIG_INITRD_TAG -#endif
include/configs/stih410-b2260.h +0 -2
@@ -45,8 +45,6 @@/* Extra Commands */ -#define CONFIG_SETUP_MEMORY_TAGS -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN 0x1800000#define CONFIG_SYS_GBL_DATA_SIZE 1024/* Global data structures */
include/configs/stm32f429-discovery.h +0 -5
@@ -27,11 +27,6 @@#define CONFIG_SYS_HZ_CLOCK 1000000/* Timer is clocked at 1MHz */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SYS_CBSIZE 1024#define CONFIG_SYS_MALLOC_LEN (2 << 20)
include/configs/stm32f429-evaluation.h +0 -5
@@ -29,11 +29,6 @@#define CONFIG_SYS_HZ_CLOCK 1000000/* Timer is clocked at 1MHz */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SYS_CBSIZE 1024#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024)
include/configs/stm32f469-discovery.h +0 -5
@@ -29,11 +29,6 @@#define CONFIG_SYS_HZ_CLOCK 1000000/* Timer is clocked at 1MHz */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SYS_CBSIZE 1024#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024)
include/configs/stm32f746-disco.h +0 -5
@@ -36,11 +36,6 @@#define CONFIG_SYS_HZ_CLOCK 1000000/* Timer is clocked at 1MHz */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SYS_CBSIZE 1024#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024)
include/configs/stm32h743-disco.h +0 -5
@@ -24,11 +24,6 @@#define CONFIG_SYS_HZ_CLOCK 1000000 -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SYS_MAXARGS 16#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024)
include/configs/stm32h743-eval.h +0 -5
@@ -24,11 +24,6 @@#define CONFIG_SYS_HZ_CLOCK 1000000 -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SYS_MAXARGS 16#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024)
include/configs/stm32h750-art-pi.h +0 -5
@@ -24,11 +24,6 @@#define CONFIG_SYS_HZ_CLOCK 1000000 -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SYS_MAXARGS 16#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024)
include/configs/stm32mp1.h +0 -5
@@ -33,11 +33,6 @@#define CONFIG_LOADADDR 0xc2000000#define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -/* ATAGs */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -/* * For booting Linux, use the first 256 MB of memory, since this is * the maximum mapped by the Linux kernel during initialization.
include/configs/sunxi-common.h +0 -5
@@ -107,11 +107,6 @@#define CONFIG_SYS_64BIT_LBA #endif -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG -#define CONFIG_INITRD_TAG -#define CONFIG_SERIAL_TAG -#ifdef CONFIG_NAND_SUNXI #define CONFIG_SYS_NAND_MAX_ECCPOS 1664#define CONFIG_SYS_NAND_ONFI_DETECTION
include/configs/tam3517-common.h +0 -5
@@ -20,11 +20,6 @@#define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -/* * Size of malloc() pool */
include/configs/taurus.h +0 -3
@@ -33,9 +33,6 @@#define CONFIG_SYS_AT91_MAIN_CLOCK 18432000/* main clock xtal */ /* Misc CPU related */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_SKIP_LOWLEVEL_INIT_ONLY
include/configs/tec-ng.h +0 -5
@@ -22,11 +22,6 @@#define CONFIG_TEGRA_SLINK_CTRLS 6#define CONFIG_SPI_FLASH_SIZE (4 << 20) -/* Tag support */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#include "tegra-common-post.h" #endif /* __CONFIG_H */
include/configs/tegra-common.h +0 -2
@@ -22,8 +22,6 @@#define CONFIG_SYS_TIMER_COUNTER NV_PA_TMRUS_BASE#endif -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -/* Environment */ /*
include/configs/ti814x_evm.h +0 -4
@@ -21,10 +21,6 @@#define CONFIG_SYS_MALLOC_LEN (1024 << 10)#define CONFIG_MACH_TYPE MACH_TYPE_TI8148EVM -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG /* for ramdisk support */ -/* commands to include */ #define CONFIG_EXTRA_ENV_SETTINGS \
include/configs/ti_armv7_common.h +0 -5
@@ -16,11 +16,6 @@#ifndef __CONFIG_TI_ARMV7_COMMON_H__#define __CONFIG_TI_ARMV7_COMMON_H__ -/* Support both device trees and ATAGs. */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -/* * Our DDR memory always starts at 0x80000000 and U-Boot shall have * relocated itself to higher in memory by the time this value is used.
include/configs/turris_mox.h +0 -9
@@ -30,15 +30,6 @@4000000 ,4500000 ,5000000 ,5500000 , \ 6000000 } -/* -* For booting Linux, the board info and command line data -* have to be in the first 8 MB of memory, since this is -* the maximum mapped by the Linux kernel during initialization. -*/ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_INITRD_TAG /* enable INITRD tag */ -#define CONFIG_SETUP_MEMORY_TAGS /* enable memory tag */ -#define CONFIG_SYS_CBSIZE 1024/* Console I/O Buff Size */ /*
include/configs/usb_a9263.h +0 -4
@@ -22,10 +22,6 @@#define CONFIG_MACH_TYPE MACH_TYPE_USB_A9263 -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_SKIP_LOWLEVEL_INIT /*
include/configs/vexpress_common.h +0 -4
@@ -109,12 +109,8 @@/* Board info register */ #define SYS_ID V2M_SYSREGS -#define CONFIG_REVISION_TAG 1 -#define CONFIG_CMDLINE_TAG 1/* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1#define CONFIG_SYS_L2CACHE_OFF 1 -#define CONFIG_INITRD_TAG 1/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 512 * 1024)/* >= 512 KiB */
include/configs/vf610twr.h +0 -3
@@ -17,9 +17,6 @@#define CONFIG_SKIP_LOWLEVEL_INIT -/* Enable passing of ATAGs */ -#define CONFIG_CMDLINE_TAG -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + 2 * 1024 * 1024)
include/configs/work_92105.h +0 -3
@@ -105,9 +105,6 @@/* * Boot Linux */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_BOOTFILE "uImage"#define CONFIG_LOADADDR 0x80008000
include/configs/zmx25.h +0 -4
@@ -26,10 +26,6 @@"fatls usb 0; fatload usb 0 0x81000000 zmx25-init.bin;" \"bootm 0x81000000; bootelf 0x81000000\0" -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -/* * Hardware drivers */
Signature · 1 line
2.17.1
Re: [PATCH 3/5] arm: Disable ATAGs support
Hi Tom,
Quoted 22 lines · Tom Rini
With the exception of
nokia_rx51and icnova-a20-swac, disable ATAG support. A large number of platforms had enabled support but never supported a kernel so old as to require it. Further, some platforms are old enough to support both, but are well supported by devicetree booting, and have been for a number of years. This is because some of the ATAGs related functions have been re-used to provide the same kind of information, but for devicetree or just generally to inform the user. When needed still, rename these functions toget_board_revision()instead, to avoid conflicts. In other cases, these functions were simply unused, so drop them.Cc Andre Przywara <[email protected]>Cc Jagan Teki <[email protected]>Cc Phil Sutter <[email protected]>Cc Stefan Bosch <[email protected]>Signed-off-by Tom Rini <[email protected]>[...]--- include/configs/stemmy.h | 3 --[...]
+++b/include/configs/stemmy.h
include/configs/stemmy.h line 26
Quoted 7 lines
include/configs/stemmy.h +0
-3@@ -23,7 +23,4 @@#define CONFIG_SYS_L2_PL310 #define CONFIG_SYS_PL310_BASE 0xa0412000 -/* Generate initrd atag for downstream kernel (others are copied in stemmy.c) */ -#define CONFIG_INITRD_TAG -#endif
Please keep this option for the stemmy board. It's still used occasionally to boot the original downstream/vendor kernel which is currently still necessary to charge the battery on these devices.
See commit e2f82f93 ("board: stemmy: Copy atags for booting downstream/vendor kernel") [1] for details.
Thanks!
Stephan
[1]: https://source.denx.de/u-boot/u-boot/-/commit/e2f82f93f885dd3dd3ad74e98182add8ccd863e7.patch
Re: [PATCH 3/5] arm: Disable ATAGs support
Quoted 37 lines · Stephan Gerhold
Hi Tom,
Quoted 22 lines · Tom Rini
With the exception of
nokia_rx51and icnova-a20-swac, disable ATAG support. A large number of platforms had enabled support but never supported a kernel so old as to require it. Further, some platforms are old enough to support both, but are well supported by devicetree booting, and have been for a number of years. This is because some of the ATAGs related functions have been re-used to provide the same kind of information, but for devicetree or just generally to inform the user. When needed still, rename these functions toget_board_revision()instead, to avoid conflicts. In other cases, these functions were simply unused, so drop them.Cc Andre Przywara <[email protected]>Cc Jagan Teki <[email protected]>Cc Phil Sutter <[email protected]>Cc Stefan Bosch <[email protected]>Signed-off-by Tom Rini <[email protected]>[...]--- include/configs/stemmy.h | 3 --[...]
+++b/include/configs/stemmy.hinclude/configs/stemmy.h line 26
Quoted 7 lines
include/configs/stemmy.h +0
-3@@ -23,7 +23,4 @@#define CONFIG_SYS_L2_PL310 #define CONFIG_SYS_PL310_BASE 0xa0412000 -/* Generate initrd atag for downstream kernel (others are copied in stemmy.c) */ -#define CONFIG_INITRD_TAG -#endif Please keep this option for the stemmy board. It's still used occasionally to boot the original downstream/vendor kernel which is currently still necessary to charge the battery on these devices.
Quoted 2 lines
See commit
e2f82f93("board: stemmy: Copy atags for booting downstream/vendor kernel") [1] for details.
OK, I'll re-work this to also keep ATAGS support on stemmy when merging, thanks!
Signature · 1 line
Tom
Re: [PATCH 3/5] arm: Disable ATAGs support
In reply to Tom RiniQuoted 11 lines · Tom Rini
With the exception of
nokia_rx51and icnova-a20-swac, disable ATAG support. A large number of platforms had enabled support but never supported a kernel so old as to require it. Further, some platforms are old enough to support both, but are well supported by devicetree booting, and have been for a number of years. This is because some of the ATAGs related functions have been re-used to provide the same kind of information, but for devicetree or just generally to inform the user. When needed still, rename these functions toget_board_revision()instead, to avoid conflicts. In other cases, these functions were simply unused, so drop them.
Quoted 5 lines
Cc Andre Przywara <[email protected]>Cc Jagan Teki <[email protected]>Cc Phil Sutter <[email protected]>Cc Stefan Bosch <[email protected]>Signed-off-by Tom Rini <[email protected]>
After updating to include stemmy, ds109 and ds414, applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 4/5 arm: Add Kconfig entry for MACH_TYPE
In reply to Tom RiniAs part of migrating support for ATAGs to Kconfig, add an option for setting and passing MACH_TYPE.
--- arch/arm/Kconfig | 7 +++++++ configs/icnova-a20-swac_defconfig | 1 + configs/nokia_rx51_defconfig | 1 + include/configs/nokia_rx51.h | 2 -- 4 files changed, 9 insertions(+), 2 deletions(-)
arch/arm/Kconfig +7 -0
@@ -1920,6 +1920,13 @@ config SERIAL_TAG bool "Pass system serial number via ATAG" depends on SUPPORT_PASSING_ATAGS +config MACH_TYPE + int "Machine ID number" + depends on SUPPORT_PASSING_ATAGS + help + When booting via ATAGs, the machine type must be passed as a number. + For the full list see https://www.arm.linux.org.uk/developer/machines + config ARCH_SUPPORT_TFABOOT bool
configs/icnova-a20-swac_defconfig +1 -0
@@ -4,6 +4,7 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_SERIAL_TAG=y +CONFIG_MACH_TYPE=4283 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-swac" CONFIG_SPL=y CONFIG_MACH_SUN7I=y
configs/nokia_rx51_defconfig +1 -0
@@ -5,6 +5,7 @@ CONFIG_SUPPORT_PASSING_ATAGS=y CONFIG_CMDLINE_TAG=y CONFIG_INITRD_TAG=y CONFIG_REVISION_TAG=y +CONFIG_MACH_TYPE=1955 CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_NOKIA_RX51=y
include/configs/nokia_rx51.h +0 -2
@@ -23,8 +23,6 @@*/ #define CONFIG_SYS_L2CACHE_OFF /* pretend there is no L2 CACHE */ -#define CONFIG_MACH_TYPE MACH_TYPE_NOKIA_RX51 -#include <asm/arch/cpu.h> /* get chip and board defs */ #include <asm/arch/omap.h> #include <asm/arch/mem.h>
Signature · 1 line
2.17.1
Re: [PATCH 4/5] arm: Add Kconfig entry for MACH_TYPE
Quoted 4 lines · Tom Rini
As part of migrating support for ATAGs to
Kconfig, add an option for setting and passingMACH_TYPE.Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
PATCH 5/5 arm: Finish migration of CONFIG_MACH_TYPE
In reply to Tom RiniAs this is only useful when booting with ATAGs, which are now largely disabled, remove this value for the remaining platforms.
---
I am concerned if there are a few other devices out there running modern U-Boot and very old vendor kernels.
--- README | 10 ---------- board/LaCie/netspace_v2/netspace_v2.c | 2 ++ board/Synology/common/legacy.c | 5 +++-- configs/am335x_igep003x_defconfig | 1 - configs/axm_defconfig | 2 +- configs/corvus_defconfig | 2 +- configs/taurus_defconfig | 2 +- include/configs/am335x_evm.h | 2 -- include/configs/am335x_sl50.h | 2 -- include/configs/apalis_imx6.h | 2 -- include/configs/apalis_t30.h | 2 -- include/configs/aristainetos2.h | 1 - include/configs/at91sam9260ek.h | 18 ------------------ include/configs/baltos.h | 2 -- include/configs/beaver.h | 2 -- include/configs/brppt1.h | 3 --- include/configs/brppt2.h | 1 - include/configs/brsmarc1.h | 2 -- include/configs/brxre1.h | 2 -- include/configs/cardhu.h | 2 -- include/configs/cm_fx6.h | 1 - include/configs/cm_t335.h | 2 -- include/configs/colibri_t20.h | 2 -- include/configs/colibri_t30.h | 2 -- include/configs/dalmore.h | 2 -- include/configs/devkit3250.h | 2 -- include/configs/devkit8000.h | 1 - include/configs/dns325.h | 5 ----- include/configs/dreamplug.h | 1 - include/configs/ds109.h | 3 --- include/configs/ds414.h | 3 --- include/configs/ea-lpc3250devkitv2.h | 1 - include/configs/ethernut5.h | 3 --- include/configs/exynos5250-common.h | 2 -- include/configs/exynos5420-common.h | 3 --- include/configs/flea3.h | 2 -- include/configs/gw_ventana.h | 2 -- include/configs/harmony.h | 2 -- include/configs/iconnect.h | 5 ----- include/configs/km/km_arm.h | 2 -- include/configs/kzm9g.h | 1 - include/configs/lacie_kw.h | 21 --------------------- include/configs/lsxl.h | 2 -- include/configs/mx23_olinuxino.h | 3 --- include/configs/mx23evk.h | 3 --- include/configs/mx28evk.h | 3 --- include/configs/mx51evk.h | 1 - include/configs/mx53loco.h | 2 -- include/configs/mx6sabreauto.h | 1 - include/configs/mx6sabresd.h | 1 - include/configs/mx6slevk.h | 2 -- include/configs/nas220.h | 5 ----- include/configs/nitrogen6x.h | 2 -- include/configs/odroid.h | 2 -- include/configs/omap4_sdp4430.h | 1 - include/configs/origen.h | 2 -- include/configs/paz00.h | 2 -- include/configs/pdu001.h | 3 --- include/configs/phycore_am335x_r2.h | 2 -- include/configs/pm9261.h | 2 -- include/configs/pm9263.h | 2 -- include/configs/pogo_e02.h | 5 ----- include/configs/rpi.h | 15 --------------- include/configs/seaboard.h | 2 -- include/configs/siemens-am33x-common.h | 3 --- include/configs/smartweb.h | 1 - include/configs/smdkv310.h | 3 --- include/configs/sun4i.h | 2 -- include/configs/sun5i.h | 2 -- include/configs/sun7i.h | 2 -- include/configs/sunxi-common.h | 16 ---------------- include/configs/tbs2910.h | 2 -- include/configs/ti814x_evm.h | 1 - include/configs/ti816x_evm.h | 2 -- include/configs/trats.h | 2 -- include/configs/trimslice.h | 2 -- include/configs/udoo.h | 3 --- include/configs/usb_a9263.h | 2 -- include/configs/ventana.h | 2 -- include/configs/vf610twr.h | 2 -- include/configs/wandboard.h | 2 -- include/configs/work_92105.h | 6 ------ include/configs/zmx25.h | 1 - 83 files changed, 8 insertions(+), 244 deletions(-)
README +0 -10
@@ -599,16 +599,6 @@ The following options need to be configured: crash. This is needed for buggy hardware (uc101) where no pull down resistor is connected to the signal IDE5V_DD7. - CONFIG_MACH_TYPE [relevant for ARM only][mandatory] - - This setting is mandatory for all boards that have only one - machine type and must be used to specify the machine type - number as it appears in the ARM machine registry - (see https://www.arm.linux.org.uk/developer/machines/). - Only boards that have multiple machine types supported - in a single configuration file and the machine type is - runtime discoverable, do not have to use this setting. - - vxWorks boot parameters: bootvx constructs a valid bootline using the following
board/LaCie/netspace_v2/netspace_v2.c +2 -0
@@ -73,8 +73,10 @@ int board_early_init_f(void)int board_init (void ) { +#ifdef CONFIG_MACH_TYPE /* Machine number */ gd->bd->bi_arch_number =CONFIG_MACH_TYPE ; +#endif /* Boot parameters address */ gd->bd->bi_boot_params =mvebu_sdram_bar (0 ) +0x100 ;
board/Synology/common/legacy.c +3 -2
@@ -15,14 +15,15 @@static unsigned int syno_board_id (void ) { +#ifdef CONFIG_MACH_TYPE switch (CONFIG_MACH_TYPE ) {case 527 :return SYNO_DS109_ID ;case 3036 :return SYNO_AXP_4BAY_2BAY ; -default : -return 0 ; } +#endif +return 0 ; }static unsigned int usb_port_modes (void )
configs/am335x_igep003x_defconfig +0 -1
@@ -16,7 +16,6 @@ CONFIG_SPL_FS_FAT=y CONFIG_SPL_LIBDISK_SUPPORT=y CONFIG_DISTRO_DEFAULTS=y CONFIG_OF_BOARD_SETUP=y -CONFIG_SYS_EXTRA_OPTIONS="MACH_TYPE=MACH_TYPE_IGEP0033" # CONFIG_USE_BOOTCOMMAND is not set CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SPL_FS_EXT4=y
configs/axm_defconfig +1 -1
@@ -24,7 +24,7 @@ CONFIG_ENV_OFFSET_REDUND=0x180000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2068" +CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTCOMMAND=y CONFIG_BOOTCOMMAND="run flash_self"
configs/corvus_defconfig +1 -1
@@ -16,7 +16,7 @@ CONFIG_SPL_TEXT_BASE=0x300000 CONFIG_SPL_SERIAL_SUPPORT=y CONFIG_SPL=y CONFIG_ENV_OFFSET_REDUND=0x180000 -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,MACH_TYPE=2066,SYS_USE_NANDFLASH" +CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9M10G45,SYS_USE_NANDFLASH" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
configs/taurus_defconfig +1 -1
@@ -26,7 +26,7 @@ CONFIG_ENV_OFFSET_REDUND=0x180000 CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI_SUPPORT=y CONFIG_DEBUG_UART=y -CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20,MACH_TYPE=2067" +CONFIG_SYS_EXTRA_OPTIONS="AT91SAM9G20" CONFIG_BOOTDELAY=3 CONFIG_USE_BOOTARGS=y CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk mtdparts=atmel_nand:256k(bootstrap)ro,512k(uboot)ro,256k(env),256k(env_redundant),256k(spare),512k(dtb),6M(kernel)ro,-(rootfs) root=/dev/mtdblock7 rw rootfstype=jffs2"
include/configs/am335x_evm.h +0 -2
@@ -25,8 +25,6 @@#define CONFIG_SYS_BOOTM_LEN SZ_16M -#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM -/* Clock Defines */ #define V_OSCK 24000000/* Clock output from T2 */ #define V_SCLK (V_OSCK)
include/configs/am335x_sl50.h +0 -2
@@ -16,8 +16,6 @@#define CONFIG_SYS_BOOTM_LEN (16 << 20) -/*#define CONFIG_MACH_TYPE 3589 Until the next sync */ -/* Clock Defines */ #define V_OSCK 24000000/* Clock output from T2 */ #define V_SCLK (V_OSCK)
include/configs/apalis_imx6.h +0 -2
@@ -14,8 +14,6 @@#undef CONFIG_DISPLAY_BOARDINFO -#define CONFIG_MACH_TYPE 4886 -#include <asm/arch/imx-regs.h> #include <asm/mach-imx/gpio.h>
include/configs/apalis_t30.h +0 -2
@@ -23,8 +23,6 @@#define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_APALIS_T30 -/* PCI networking support */ #define CONFIG_E1000_NO_NVM
include/configs/aristainetos2.h +0 -1
@@ -28,7 +28,6 @@#include "mx6_common.h" -#define CONFIG_MACH_TYPE 4501#define CONFIG_MMCROOT "/dev/mmcblk0p1"/* MMC Configs */
include/configs/at91sam9260ek.h +0 -18
@@ -65,24 +65,6 @@ (ATMEL_BASE_SRAM1 + 16 * 1024 - GENERATED_GBL_DATA_SIZE)#endif -/* -* The (arm)linux board id set by generic code depending on configured board -* (see boards.cfg for different boards) -*/ -#ifdef CONFIG_AT91SAM9G20 -/* the sam9g20 variants have two different board ids */ -# ifdef CONFIG_AT91SAM9G20EK_2MMC -/* we may be setup for the 2MMC variant of at91sam9g20ek */ -# define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9G20EK_2MMC -# else -/* or the normal at91sam9g20ek */ -# define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9G20EK -# endif -#else -/* otherwise default to good old at91sam9260ek */ -# define CONFIG_MACH_TYPE MACH_TYPE_AT91SAM9260EK -#endif -/* NAND flash */ #ifdef CONFIG_CMD_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1
include/configs/baltos.h +0 -2
@@ -19,8 +19,6 @@#include <linux/sizes.h> #include <configs/ti_am335x_common.h> -#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM -/* Clock Defines */ #define V_OSCK 24000000/* Clock output from T2 */ #define V_SCLK (V_OSCK)
include/configs/beaver.h +0 -2
@@ -20,8 +20,6 @@#define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_BEAVER -/* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6#define CONFIG_SPI_FLASH_SIZE (4 << 20)
include/configs/brppt1.h +0 -3
@@ -25,9 +25,6 @@#define CONFIG_POWER_TPS65217 -/*#define CONFIG_MACH_TYPE 3589*/ -#define CONFIG_MACH_TYPE 0xFFFFFFFF/* TODO: check with kernel*/ -/* * When we have NAND flash we expect to be making use of mtdparts, * both for ease of use in U-Boot and for passing information on to
include/configs/brppt2.h +0 -1
@@ -27,7 +27,6 @@#define CONFIG_FSL_USDHC /* Boot */ -#define CONFIG_MACH_TYPE 0xFFFFFFFF/* misc */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
include/configs/brsmarc1.h +0 -2
@@ -25,8 +25,6 @@#define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK) -#define CONFIG_MACH_TYPE 3589 -#ifndef CONFIG_SPL_BUILD /* Default environment */
include/configs/brxre1.h +0 -2
@@ -24,8 +24,6 @@#define V_OSCK 26000000/* Clock output from T2 */ #define V_SCLK (V_OSCK) -#define CONFIG_MACH_TYPE 3589 -#ifndef CONFIG_SPL_BUILD /* Default environment */
include/configs/cardhu.h +0 -2
@@ -24,8 +24,6 @@#define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_CARDHU -/* SPI */ #define CONFIG_TEGRA_SLINK_CTRLS 6#define CONFIG_SPI_FLASH_SIZE (4 << 20)
include/configs/cm_fx6.h +0 -1
@@ -14,7 +14,6 @@/* Machine config */ #define CONFIG_SYS_LITTLE_ENDIAN -#define CONFIG_MACH_TYPE 4273/* MMC */ #define CONFIG_SYS_FSL_USDHC_NUM 3
include/configs/cm_t335.h +0 -2
@@ -17,8 +17,6 @@#undef CONFIG_MAX_RAM_BANK_SIZE#define CONFIG_MAX_RAM_BANK_SIZE (512 << 20)/* 512MB */ -#define CONFIG_MACH_TYPE MACH_TYPE_CM_T335 -/* Clock Defines */ #define V_OSCK 25000000/* Clock output from T2 */ #define V_SCLK (V_OSCK)
include/configs/colibri_t20.h +0 -2
@@ -15,8 +15,6 @@#define CONFIG_TEGRA_UARTA_SDIO1 #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_TEGRA2 -/* LCD support */ #define CONFIG_LCD_LOGO
include/configs/colibri_t30.h +0 -2
@@ -24,8 +24,6 @@#define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_T30 -/* Increase console I/O buffer size */ #undef CONFIG_SYS_CBSIZE#define CONFIG_SYS_CBSIZE 1024
include/configs/dalmore.h +0 -2
@@ -17,8 +17,6 @@#define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_DALMORE -/* Environment in eMMC, at the end of 2nd "boot sector" */ /* SPI */
include/configs/devkit3250.h +0 -2
@@ -12,8 +12,6 @@#include <linux/sizes.h> #include <asm/arch/cpu.h> -#define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT3250 -#if !defined(CONFIG_SPL_BUILD )#define CONFIG_SKIP_LOWLEVEL_INIT #endif
include/configs/devkit8000.h +0 -1
@@ -15,7 +15,6 @@#define __CONFIG_H/* High Level Configuration Options */ -#define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT8000/* * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM
include/configs/dns325.h +0 -5
@@ -12,11 +12,6 @@#ifndef _CONFIG_DNS325_H#define _CONFIG_DNS325_H -/* -* Machine number definition -*/ -#define CONFIG_MACH_TYPE MACH_TYPE_DNS325 -/* * High Level Configuration Options (easy to change) */
include/configs/dreamplug.h +0 -1
@@ -15,7 +15,6 @@* High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1/* CPU Core subversion */ -#define CONFIG_MACH_TYPE MACH_TYPE_DREAMPLUG#include "mv-plug-common.h"
include/configs/ds109.h +0 -3
@@ -11,9 +11,6 @@#ifndef _CONFIG_DS109_H#define _CONFIG_DS109_H -/* Provide the MACH_TYPE value that the vendor kernel requires. */ -#define CONFIG_MACH_TYPE 527 -/* * High Level Configuration Options (easy to change) */
include/configs/ds414.h +0 -3
@@ -6,9 +6,6 @@#ifndef _CONFIG_SYNOLOGY_DS414_H#define _CONFIG_SYNOLOGY_DS414_H -/* Vendor kernel expects this MACH_TYPE */ -#define CONFIG_MACH_TYPE 3036 -/* * High Level Configuration Options (easy to change) */
include/configs/ea-lpc3250devkitv2.h +0 -1
@@ -13,7 +13,6 @@/* * SoC and board defines */ -#define CONFIG_MACH_TYPE MACH_TYPE_LPC3XXX#define CONFIG_SKIP_LOWLEVEL_INIT #define CONFIG_BOARD_SIZE_LIMIT 0x000fffff/* maximum allowable size for full U-Boot binary */
include/configs/ethernut5.h +0 -3
@@ -16,9 +16,6 @@/* The first stage boot loader takes care of low level initialization. */ #define CONFIG_SKIP_LOWLEVEL_INIT -/* Set our official architecture number. */ -#define CONFIG_MACH_TYPE MACH_TYPE_ETHERNUT5 -/* CPU information */ /* ARM asynchronous clock */
include/configs/exynos5250-common.h +0 -2
@@ -13,8 +13,6 @@#define CONFIG_SYS_SDRAM_BASE 0x40000000 -#define CONFIG_MACH_TYPE MACH_TYPE_SMDK5250 -#define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024)#define CONFIG_IRAM_STACK 0x02050000
include/configs/exynos5420-common.h +0 -3
@@ -12,9 +12,6 @@#define CONFIG_EXYNOS5_DT -/* Provide the MACH_TYPE value that the vendor kernel requires. */ -#define CONFIG_MACH_TYPE 8002 -#define CONFIG_VAR_SIZE_SPL #define CONFIG_IRAM_TOP 0x02074000
include/configs/flea3.h +0 -2
@@ -17,8 +17,6 @@/* High Level Configuration Options */ #define CONFIG_MX35 -#define CONFIG_MACH_TYPE MACH_TYPE_FLEA3 -/* Set TEXT at the beginning of the NOR flash */ /* This is required to setup the ESDC controller */
include/configs/gw_ventana.h +0 -2
@@ -24,8 +24,6 @@#include "imx6_spl.h" /* common IMX6 SPL configuration */ #include "mx6_common.h" -#define CONFIG_MACH_TYPE 4520/* Gateworks Ventana Platform */ -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
include/configs/harmony.h +0 -2
@@ -23,8 +23,6 @@#define CONFIG_SYS_NS16550_COM2 NV_PA_APB_UARTA_BASE#endif -#define CONFIG_MACH_TYPE MACH_TYPE_HARMONY -/* NAND support */ #define CONFIG_TEGRA_NAND #define CONFIG_SYS_MAX_NAND_DEVICE 1
include/configs/iconnect.h +0 -5
@@ -15,11 +15,6 @@#define CONFIG_KW88F6281 /* SOC Name */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ -/* -* Machine type -*/ -#define CONFIG_MACH_TYPE MACH_TYPE_ICONNECT -#include "mv-common.h" /*
include/configs/km/km_arm.h +0 -2
@@ -25,8 +25,6 @@#define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #define CONFIG_KW88F6281 /* SOC Name */ -#define CONFIG_MACH_TYPE MACH_TYPE_KM_KIRKWOOD -#define CONFIG_NAND_ECC_BCH /* include common defines/options for all Keymile boards */
include/configs/kzm9g.h +0 -1
@@ -8,7 +8,6 @@#define __KZM9G_H#define CONFIG_SH73A0 -#define CONFIG_MACH_TYPE MACH_TYPE_KZM9G#include <asm/arch/rmobile.h>
include/configs/lacie_kw.h +0 -21
@@ -6,27 +6,6 @@#ifndef _CONFIG_LACIE_KW_H#define _CONFIG_LACIE_KW_H -/* -* Machine number definition -*/ -#if defined(CONFIG_INETSPACE_V2 ) -#define CONFIG_MACH_TYPE MACH_TYPE_INETSPACE_V2 -#elif defined(CONFIG_NETSPACE_V2 ) -#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_V2 -#elif defined(CONFIG_NETSPACE_LITE_V2 ) -#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_LITE_V2 -#elif defined(CONFIG_NETSPACE_MINI_V2 ) -#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MINI_V2 -#elif defined(CONFIG_NETSPACE_MAX_V2 ) -#define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MAX_V2 -#elif defined(CONFIG_D2NET_V2 ) -#define CONFIG_MACH_TYPE MACH_TYPE_D2NET_V2 -#elif defined(CONFIG_NET2BIG_V2 ) -#define CONFIG_MACH_TYPE MACH_TYPE_NET2BIG_V2 -#else -#error "Unknown board" -#endif -/* * High Level Configuration Options (easy to change) */
include/configs/lsxl.h +0 -2
@@ -12,10 +12,8 @@*/ #if defined(CONFIG_LSCHLV2 )#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-lschl.cfg -#define CONFIG_MACH_TYPE 3006#elif defined(CONFIG_LSXHL )#define CONFIG_SYS_KWD_CONFIG $(CONFIG_BOARDDIR)/kwbimage-lsxhl.cfg -#define CONFIG_MACH_TYPE 2663#else #error "unknown board"#endif
include/configs/mx23_olinuxino.h +0 -3
@@ -5,9 +5,6 @@#ifndef __CONFIGS_MX23_OLINUXINO_H__#define __CONFIGS_MX23_OLINUXINO_H__ -/* System configurations */ -#define CONFIG_MACH_TYPE 4105 -/* U-Boot Commands */ /* Memory configuration */
include/configs/mx23evk.h +0 -3
@@ -8,9 +8,6 @@#ifndef __CONFIGS_MX23EVK_H__#define __CONFIGS_MX23EVK_H__ -/* System configurations */ -#define CONFIG_MACH_TYPE MACH_TYPE_MX23EVK -/* U-Boot Commands */ /* Memory configuration */
include/configs/mx28evk.h +0 -3
@@ -10,9 +10,6 @@#ifndef __CONFIGS_MX28EVK_H__#define __CONFIGS_MX28EVK_H__ -/* System configurations */ -#define CONFIG_MACH_TYPE MACH_TYPE_MX28EVK -/* Memory configuration */ #define PHYS_SDRAM_1 0x40000000/* Base address */ #define PHYS_SDRAM_1_SIZE 0x40000000/* Max 1 GB RAM */
include/configs/mx51evk.h +0 -1
@@ -16,7 +16,6 @@#include <asm/arch/imx-regs.h> -#define CONFIG_MACH_TYPE MACH_TYPE_MX51_BABBAGE/* * Size of malloc() pool */
include/configs/mx53loco.h +0 -2
@@ -9,8 +9,6 @@#ifndef __CONFIG_H#define __CONFIG_H -#define CONFIG_MACH_TYPE MACH_TYPE_MX53_LOCO -#include <asm/arch/imx-regs.h> #define CONFIG_SYS_FSL_CLK
include/configs/mx6sabreauto.h +0 -1
@@ -12,7 +12,6 @@#include "imx6_spl.h" #endif -#define CONFIG_MACH_TYPE 3529#define CONFIG_MXC_UART_BASE UART4_BASE#define CONSOLE_DEV "ttymxc3"
include/configs/mx6sabresd.h +0 -1
@@ -12,7 +12,6 @@#include "imx6_spl.h" #endif -#define CONFIG_MACH_TYPE 3980#define CONFIG_MXC_UART_BASE UART1_BASE#define CONSOLE_DEV "ttymxc0"
include/configs/mx6slevk.h +0 -2
@@ -14,8 +14,6 @@#include "imx6_spl.h" #endif -#define CONFIG_MACH_TYPE MACH_TYPE_MX6SL_EVK -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M)
include/configs/nas220.h +0 -5
@@ -11,11 +11,6 @@#ifndef _CONFIG_NAS220_H#define _CONFIG_NAS220_H -/* -* Machine type ID -*/ -#define CONFIG_MACH_TYPE MACH_TYPE_RD88F6192_NAS -/* * High Level Configuration Options (easy to change) */
include/configs/nitrogen6x.h +0 -2
@@ -11,8 +11,6 @@#include "mx6_common.h" -#define CONFIG_MACH_TYPE 3769 -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * 1024 * 1024)
include/configs/odroid.h +0 -2
@@ -19,8 +19,6 @@#define CONFIG_SYS_PL310_BASE 0x10502000#endif -#define CONFIG_MACH_TYPE 4289 -#define CONFIG_SYS_SDRAM_BASE 0x40000000#define SDRAM_BANK_SIZE (256 << 20)/* 256 MB */ #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE
include/configs/omap4_sdp4430.h +0 -1
@@ -15,7 +15,6 @@/* * High Level Configuration Options */ -#define CONFIG_MACH_TYPE MACH_TYPE_OMAP_4430SDP#include <configs/ti_omap4_common.h>
include/configs/origen.h +0 -2
@@ -22,8 +22,6 @@/* memtest works on */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x3E00000) -#define CONFIG_MACH_TYPE MACH_TYPE_ORIGEN -#define CONFIG_SYS_MEM_TOP_HIDE (1 << 20)/* ram console */ #define CONFIG_SYS_MONITOR_BASE 0x00000000
include/configs/paz00.h +0 -2
@@ -19,8 +19,6 @@#define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_PAZ00 -/* Environment in eMMC, at the end of 2nd "boot sector" */ #include "tegra-common-post.h"
include/configs/pdu001.h +0 -3
@@ -14,9 +14,6 @@/* Using 32K of volatile storage for environment */ -#define MACH_TYPE_PDU001 5075 -#define CONFIG_MACH_TYPE MACH_TYPE_PDU001 -/* Clock Defines */ #define V_OSCK 24000000/* Clock output from T2 */ #define V_SCLK (V_OSCK)
include/configs/phycore_am335x_r2.h +0 -2
@@ -14,8 +14,6 @@#include <configs/ti_am335x_common.h> -#define CONFIG_MACH_TYPE MACH_TYPE_SBC_PHYCORE_AM335X -#ifdef CONFIG_MTD_RAW_NAND #define NANDARGS \ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
include/configs/pm9261.h +0 -2
@@ -27,8 +27,6 @@#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9261" -#define CONFIG_MACH_TYPE MACH_TYPE_PM9261 -/* clocks */ /* CKGR_MOR - enable main osc. */ #define CONFIG_SYS_MOR_VAL \
include/configs/pm9263.h +0 -2
@@ -27,8 +27,6 @@#define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9263" -#define CONFIG_MACH_TYPE MACH_TYPE_PM9263 -/* clocks */ #define CONFIG_SYS_MOR_VAL \ (AT91_PMC_MOR_MOSCEN | \
include/configs/pogo_e02.h +0 -5
@@ -12,11 +12,6 @@#ifndef _CONFIG_POGO_E02_H#define _CONFIG_POGO_E02_H -/* -* Machine type definition and ID -*/ -#define CONFIG_MACH_TYPE MACH_TYPE_POGO_E02 -/* * High Level Configuration Options (easy to change) */
include/configs/rpi.h +0 -15
@@ -26,21 +26,6 @@ (&((struct bcm2835_timer_regs *)BCM2835_TIMER_PHYSADDR)->clo)#endif -/* -* 2835 is a SKU in a series for which the 2708 is the first or primary SoC, -* so 2708 has historically been used rather than a dedicated 2835 ID. -* -* We don't define a machine type for bcm2709/bcm2836 since the RPi Foundation -* chose to use someone else's previously registered machine ID (3139, MX51_GGC) -* rather than obtaining a valid ID:-/ -* -* For the bcm2837, hopefully a machine type is not needed, since everything -* is DT. -*/ -#ifdef CONFIG_BCM2835 -#define CONFIG_MACH_TYPE MACH_TYPE_BCM2708 -#endif -/* Memory layout */ #define CONFIG_SYS_SDRAM_BASE 0x00000000#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE
include/configs/seaboard.h +0 -2
@@ -24,8 +24,6 @@#define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_SEABOARD -/* Environment in eMMC, at the end of 2nd "boot sector" */ /* NAND support */
include/configs/siemens-am33x-common.h +0 -3
@@ -19,9 +19,6 @@#define CONFIG_DMA_COHERENT_SIZE (1 << 20)#define CONFIG_SYS_MALLOC_LEN (16 * 1024 * 1024) -#ifdef CONFIG_SIEMENS_MACH_TYPE -#define CONFIG_MACH_TYPE CONFIG_SIEMENS_MACH_TYPE -#endif /* commands to include */
include/configs/smartweb.h +0 -1
@@ -46,7 +46,6 @@#define CONFIG_SYS_MAXARGS 32/* setting board specific options */ -#define CONFIG_MACH_TYPE MACH_TYPE_SMARTWEB#define CONFIG_SYS_AUTOLOAD "yes"#define CONFIG_RESET_TO_RETRY
include/configs/smdkv310.h +0 -3
@@ -16,9 +16,6 @@/* High Level Configuration Options */ #define CONFIG_EXYNOS4210 1/* which is a EXYNOS4210 SoC */ -/* Mach Type */ -#define CONFIG_MACH_TYPE MACH_TYPE_SMDKV310 -#define CONFIG_SYS_SDRAM_BASE 0x40000000/* Handling Sleep Mode*/
include/configs/sun4i.h +0 -2
@@ -16,6 +16,4 @@*/ #include <configs/sunxi-common.h> -#define CONFIG_MACH_TYPE (4104 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28)) -#endif /* __CONFIG_H */
include/configs/sun5i.h +0 -2
@@ -16,6 +16,4 @@*/ #include <configs/sunxi-common.h> -#define CONFIG_MACH_TYPE (4138 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28)) -#endif /* __CONFIG_H */
include/configs/sun7i.h +0 -2
@@ -20,6 +20,4 @@*/ #include <configs/sunxi-common.h> -#define CONFIG_MACH_TYPE (4283 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28)) -#endif /* __CONFIG_H */
include/configs/sunxi-common.h +0 -16
@@ -15,22 +15,6 @@#include <asm/arch/cpu.h> #include <linux/stringify.h> -#ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT -/* -* The U-Boot workarounds bugs in the outdated buggy sunxi-3.4 kernels at the -* expense of restricting some features, so the regular machine id values can -* be used. -*/ -# define CONFIG_MACH_TYPE_COMPAT_REV 0 -#else -/* -* A compatibility guard to prevent loading outdated buggy sunxi-3.4 kernels. -* Only sunxi-3.4 kernels with appropriate fixes applied are able to pass -* beyond the machine id check. -*/ -# define CONFIG_MACH_TYPE_COMPAT_REV 1 -#endif -#ifdef CONFIG_ARM64 #define CONFIG_SYS_BOOTM_LEN (32 << 20)#endif
include/configs/tbs2910.h +0 -2
@@ -12,8 +12,6 @@/* General configuration */ -#define CONFIG_MACH_TYPE 3980 -#define CONFIG_SYS_HZ 1000/* Physical Memory Map */
include/configs/ti814x_evm.h +0 -1
@@ -19,7 +19,6 @@#include <asm/arch/omap.h> #define CONFIG_SYS_MALLOC_LEN (1024 << 10) -#define CONFIG_MACH_TYPE MACH_TYPE_TI8148EVM/* commands to include */
include/configs/ti816x_evm.h +0 -2
@@ -12,8 +12,6 @@#include <configs/ti_armv7_omap.h> #include <asm/arch/omap.h> -#define CONFIG_MACH_TYPE MACH_TYPE_TI8168EVM -#define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ "mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
include/configs/trats.h +0 -2
@@ -29,8 +29,6 @@/* memtest works on */ #define CONFIG_SYS_LOAD_ADDR (CONFIG_SYS_SDRAM_BASE + 0x4800000) -#define CONFIG_MACH_TYPE MACH_TYPE_TRATS -#define CONFIG_BOOTCOMMAND "run autoboot"#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \
include/configs/trimslice.h +0 -2
@@ -18,8 +18,6 @@#define CONFIG_TEGRA_UARTA_GPU #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_TRIMSLICE -/* SPI */ /* Environment in SPI */
include/configs/udoo.h +0 -3
@@ -12,9 +12,6 @@#include "imx6_spl.h" -/* Provide the MACH_TYPE value that the vendor kernel requires. */ -#define CONFIG_MACH_TYPE 4800 -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M)
include/configs/usb_a9263.h +0 -2
@@ -20,8 +20,6 @@#define CONFIG_SYS_AT91_MAIN_CLOCK 12000000/* 12 MHz crystal */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 -#define CONFIG_MACH_TYPE MACH_TYPE_USB_A9263 -#define CONFIG_SKIP_LOWLEVEL_INIT /*
include/configs/ventana.h +0 -2
@@ -17,8 +17,6 @@#define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -#define CONFIG_MACH_TYPE MACH_TYPE_VENTANA -/* Environment in eMMC, at the end of 2nd "boot sector" */ #include "tegra-common-post.h"
include/configs/vf610twr.h +0 -2
@@ -13,8 +13,6 @@#define CONFIG_SYS_FSL_CLK -#define CONFIG_MACH_TYPE 4146 -#define CONFIG_SKIP_LOWLEVEL_INIT /* Size of malloc() pool */
include/configs/wandboard.h +0 -2
@@ -12,8 +12,6 @@#include "imx6_spl.h" -#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD_IMX6 -/* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M)
include/configs/work_92105.h +0 -6
@@ -13,12 +13,6 @@#include <linux/sizes.h> #include <asm/arch/cpu.h> -/* -* Define work_92105 machine type by hand -- done only for compatibility -* with original board code -*/ -#define CONFIG_MACH_TYPE 736 -#if !defined(CONFIG_SPL_BUILD )#define CONFIG_SKIP_LOWLEVEL_INIT #endif
include/configs/zmx25.h +0 -1
@@ -15,7 +15,6 @@#define CONFIG_SYS_TIMER_COUNTER \ (&((struct gpt_regs *)IMX_GPT1_BASE)->counter) -#define CONFIG_MACH_TYPE MACH_TYPE_ZMX25/* * Environment settings */
Signature · 1 line
2.17.1
Re: [PATCH 5/5] arm: Finish migration of CONFIG_MACH_TYPE
Quoted 5 lines · Tom Rini
As this is only useful when booting with ATAGs, which are now largely disabled, remove this value for the remaining platforms.
Cc Phil Sutter <[email protected]>Signed-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom
Quoted 4 lines · Tom Rini
This converts the following to
Kconfig:
CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIGSigned-off-by Tom Rini <[email protected]>
Applied to u-boot/master, thanks!
Signature · 1 line
Tom