diff options
246 files changed, 197 insertions, 874 deletions
@@ -586,16 +586,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 diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig index d49f26fed47..21f17c202f6 100644 --- a/arch/arm/Kconfig +++ b/arch/arm/Kconfig @@ -1907,6 +1907,50 @@ config TARGET_XENGUEST_ARM64 select SSCANF endchoice +config SUPPORT_PASSING_ATAGS + bool "Support pre-devicetree ATAG-based booting" + depends on !ARM64 + imply 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 SETUP_MEMORY_TAGS + bool "Pass memory size information via ATAG" + depends on SUPPORT_PASSING_ATAGS + +config CMDLINE_TAG + bool "Pass Linux kernel cmdline via ATAG" + depends on SUPPORT_PASSING_ATAGS + +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 STATIC_MACH_TYPE + bool "Statically define the Machine ID number" + help + When booting via ATAGs, enable this option if we know the correct + machine ID number to use at compile time. Some systems will be + passed the number dynamically by whatever loads U-Boot. + +config MACH_TYPE + int "Machine ID number" + depends on STATIC_MACH_TYPE + 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 diff --git a/arch/arm/include/asm/bootm.h b/arch/arm/include/asm/bootm.h index a2131ca07c5..27f183b93d6 100644 --- a/arch/arm/include/asm/bootm.h +++ b/arch/arm/include/asm/bootm.h @@ -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) { } diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index 02db322f51a..ee5cc479039 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -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 17 void 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) diff --git a/arch/arm/mach-imx/imx8ulp/soc.c b/arch/arm/mach-imx/imx8ulp/soc.c index 1c33acc7dd6..bba6323f96f 100644 --- a/arch/arm/mach-imx/imx8ulp/soc.c +++ b/arch/arm/mach-imx/imx8ulp/soc.c @@ -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]; diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index 6f9a30bb5f4..9c7d5f18dad 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -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 diff --git a/board/CarMediaLab/flea3/flea3.c b/board/CarMediaLab/flea3/flea3.c index 12c5ac331f9..ecd70ecbdc4 100644 --- a/board/CarMediaLab/flea3/flea3.c +++ b/board/CarMediaLab/flea3/flea3.c @@ -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 diff --git a/board/LaCie/netspace_v2/netspace_v2.c b/board/LaCie/netspace_v2/netspace_v2.c index 730eab7e703..22bb008745e 100644 --- a/board/LaCie/netspace_v2/netspace_v2.c +++ b/board/LaCie/netspace_v2/netspace_v2.c @@ -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; diff --git a/board/Synology/common/Makefile b/board/Synology/common/Makefile index 62354cc2e82..f688b549063 100644 --- a/board/Synology/common/Makefile +++ b/board/Synology/common/Makefile @@ -2,4 +2,4 @@ # # Copyright (C) 2021 Phil Sutter <phil@nwl.cc> -obj-y += legacy.o +obj-$(SUPPORT_PASSING_ATAGS) += legacy.o diff --git a/board/Synology/common/legacy.c b/board/Synology/common/legacy.c index 3c89e92ae73..06f964f53a3 100644 --- a/board/Synology/common/legacy.c +++ b/board/Synology/common/legacy.c @@ -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) diff --git a/board/beckhoff/mx53cx9020/mx53cx9020.c b/board/beckhoff/mx53cx9020/mx53cx9020.c index a3657db8266..e7b131836b6 100644 --- a/board/beckhoff/mx53cx9020/mx53cx9020.c +++ b/board/beckhoff/mx53cx9020/mx53cx9020.c @@ -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 diff --git a/board/broadcom/bcmstb/bcmstb.c b/board/broadcom/bcmstb/bcmstb.c index 076ac941441..276e59b3bd2 100644 --- a/board/broadcom/bcmstb/bcmstb.c +++ b/board/broadcom/bcmstb/bcmstb.c @@ -38,11 +38,6 @@ int board_init(void) return 0; } -u32 get_board_rev(void) -{ - return 0; -} - void reset_cpu(void) { } diff --git a/board/compulab/cm_fx6/cm_fx6.c b/board/compulab/cm_fx6/cm_fx6.c index f29b08247ec..c54bffdae45 100644 --- a/board/compulab/cm_fx6/cm_fx6.c +++ b/board/compulab/cm_fx6/cm_fx6.c @@ -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, diff --git a/board/davinci/da8xxevm/da850evm.c b/board/davinci/da8xxevm/da850evm.c index f6ce3367f86..2436aab71cc 100644 --- a/board/davinci/da8xxevm/da850evm.c +++ b/board/davinci/da8xxevm/da850evm.c @@ -232,6 +232,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: @@ -259,6 +260,7 @@ u32 get_board_rev(void) rev = 1; return rev; } +#endif int board_early_init_f(void) { diff --git a/board/davinci/da8xxevm/omapl138_lcdk.c b/board/davinci/da8xxevm/omapl138_lcdk.c index 43d9b69ae65..cd021cc8e58 100644 --- a/board/davinci/da8xxevm/omapl138_lcdk.c +++ b/board/davinci/da8xxevm/omapl138_lcdk.c @@ -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) { /* diff --git a/board/freescale/imxrt1020-evk/imxrt1020-evk.c b/board/freescale/imxrt1020-evk/imxrt1020-evk.c index 479e66bddc4..54a733b12ce 100644 --- a/board/freescale/imxrt1020-evk/imxrt1020-evk.c +++ b/board/freescale/imxrt1020-evk/imxrt1020-evk.c @@ -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; diff --git a/board/freescale/imxrt1050-evk/imxrt1050-evk.c b/board/freescale/imxrt1050-evk/imxrt1050-evk.c index eb492390dbf..61329165786 100644 --- a/board/freescale/imxrt1050-evk/imxrt1050-evk.c +++ b/board/freescale/imxrt1050-evk/imxrt1050-evk.c @@ -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; diff --git a/board/freescale/mx51evk/mx51evk.c b/board/freescale/mx51evk/mx51evk.c index c8439a6347a..46095acedfd 100644 --- a/board/freescale/mx51evk/mx51evk.c +++ b/board/freescale/mx51evk/mx51evk.c @@ -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) diff --git a/board/freescale/mx53loco/mx53loco.c b/board/freescale/mx53loco/mx53loco.c index 08886305697..a9800ed7698 100644 --- a/board/freescale/mx53loco/mx53loco.c +++ b/board/freescale/mx53loco/mx53loco.c @@ -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) diff --git a/board/freescale/mx6sabreauto/mx6sabreauto.c b/board/freescale/mx6sabreauto/mx6sabreauto.c index e92ef26d0ad..9155dcfbd09 100644 --- a/board/freescale/mx6sabreauto/mx6sabreauto.c +++ b/board/freescale/mx6sabreauto/mx6sabreauto.c @@ -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) { diff --git a/board/friendlyarm/nanopi2/board.c b/board/friendlyarm/nanopi2/board.c index c0fe2d546f6..70e4dfcfa45 100644 --- a/board/friendlyarm/nanopi2/board.c +++ b/board/friendlyarm/nanopi2/board.c @@ -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(); diff --git a/board/friendlyarm/nanopi2/hwrev.c b/board/friendlyarm/nanopi2/hwrev.c index b1e23a48a80..585e08c944f 100644 --- a/board/friendlyarm/nanopi2/hwrev.c +++ b/board/friendlyarm/nanopi2/hwrev.c @@ -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(); diff --git a/board/friendlyarm/nanopi2/hwrev.h b/board/friendlyarm/nanopi2/hwrev.h index 1b1a828afb3..403303131e7 100644 --- a/board/friendlyarm/nanopi2/hwrev.h +++ b/board/friendlyarm/nanopi2/hwrev.h @@ -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__ */ diff --git a/board/ge/mx53ppd/mx53ppd.c b/board/ge/mx53ppd/mx53ppd.c index 6174125e728..9c48883648f 100644 --- a/board/ge/mx53ppd/mx53ppd.c +++ b/board/ge/mx53ppd/mx53ppd.c @@ -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) diff --git a/board/inversepath/usbarmory/usbarmory.c b/board/inversepath/usbarmory/usbarmory.c index 086d0522c78..7dbb3a91432 100644 --- a/board/inversepath/usbarmory/usbarmory.c +++ b/board/inversepath/usbarmory/usbarmory.c @@ -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} diff --git a/board/lg/sniper/sniper.c b/board/lg/sniper/sniper.c index a70166a542e..86032d7fcdf 100644 --- a/board/lg/sniper/sniper.c +++ b/board/lg/sniper/sniper.c @@ -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) { diff --git a/board/nokia/rx51/rx51.c b/board/nokia/rx51/rx51.c index fd3cec8358a..99ca36fbbea 100644 --- a/board/nokia/rx51/rx51.c +++ b/board/nokia/rx51/rx51.c @@ -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 diff --git a/board/nvidia/seaboard/seaboard.c b/board/nvidia/seaboard/seaboard.c index b88aa8e9641..829751112f1 100644 --- a/board/nvidia/seaboard/seaboard.c +++ b/board/nvidia/seaboard/seaboard.c @@ -16,7 +16,7 @@ #include <asm/gpio.h> /* TODO: Remove this code when the SPI switch is working */ -#if (CONFIG_MACH_TYPE != MACH_TYPE_VENTANA) +#ifndef CONFIG_TARGET_VENTANA void gpio_early_init_uart(void) { /* Enable UART via GPIO_PI3 (port 8, bit 3) so serial console works */ diff --git a/board/raspberrypi/rpi/rpi.c b/board/raspberrypi/rpi/rpi.c index df52a4689fa..74697ba2f16 100644 --- a/board/raspberrypi/rpi/rpi.c +++ b/board/raspberrypi/rpi/rpi.c @@ -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; diff --git a/board/samsung/common/exynos5-dt-types.c b/board/samsung/common/exynos5-dt-types.c index e2d5a7c9ba7..554fc91cc1a 100644 --- a/board/samsung/common/exynos5-dt-types.c +++ b/board/samsung/common/exynos5-dt-types.c @@ -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. diff --git a/board/samsung/goni/goni.c b/board/samsung/goni/goni.c index b32b82fc2da..ba25ba27b86 100644 --- a/board/samsung/goni/goni.c +++ b/board/samsung/goni/goni.c @@ -24,11 +24,6 @@ DECLARE_GLOBAL_DATA_PTR; -u32 get_board_rev(void) -{ - return 0; -} - int board_init(void) { /* Set Initial global variables */ diff --git a/board/samsung/origen/origen.c b/board/samsung/origen/origen.c index e17454ad77d..7a91f448969 100644 --- a/board/samsung/origen/origen.c +++ b/board/samsung/origen/origen.c @@ -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; diff --git a/board/samsung/trats2/trats2.c b/board/samsung/trats2/trats2.c index 59e6fbf4b00..a03dc873857 100644 --- a/board/samsung/trats2/trats2.c +++ b/board/samsung/trats2/trats2.c @@ -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) { diff --git a/board/samsung/universal_c210/universal.c b/board/samsung/universal_c210/universal.c index 9ef11b8471c..3764b5478b7 100644 --- a/board/samsung/universal_c210/universal.c +++ b/board/samsung/universal_c210/universal.c @@ -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) { diff --git a/board/st/stm32f429-discovery/stm32f429-discovery.c b/board/st/stm32f429-discovery/stm32f429-discovery.c index 46fcf907fc6..34f9d6bc007 100644 --- a/board/st/stm32f429-discovery/stm32f429-discovery.c +++ b/board/st/stm32f429-discovery/stm32f429-discovery.c @@ -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; diff --git a/board/st/stm32f429-evaluation/stm32f429-evaluation.c b/board/st/stm32f429-evaluation/stm32f429-evaluation.c index 3b6df1f3ab3..c170314ed85 100644 --- a/board/st/stm32f429-evaluation/stm32f429-evaluation.c +++ b/board/st/stm32f429-evaluation/stm32f429-evaluation.c @@ -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; diff --git a/board/st/stm32f469-discovery/stm32f469-discovery.c b/board/st/stm32f469-discovery/stm32f469-discovery.c index c5df9b0d9c0..122273a2ae7 100644 --- a/board/st/stm32f469-discovery/stm32f469-discovery.c +++ b/board/st/stm32f469-discovery/stm32f469-discovery.c @@ -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; diff --git a/board/st/stm32f746-disco/stm32f746-disco.c b/board/st/stm32f746-disco/stm32f746-disco.c index efa38a0e26a..376bc06a980 100644 --- a/board/st/stm32f746-disco/stm32f746-disco.c +++ b/board/st/stm32f746-disco/stm32f746-disco.c @@ -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) { diff --git a/board/st/stm32h743-disco/stm32h743-disco.c b/board/st/stm32h743-disco/stm32h743-disco.c index 4091d5f9fde..cc872300265 100644 --- a/board/st/stm32h743-disco/stm32h743-disco.c +++ b/board/st/stm32h743-disco/stm32h743-disco.c @@ -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; diff --git a/board/st/stm32h743-eval/stm32h743-eval.c b/board/st/stm32h743-eval/stm32h743-eval.c index 4091d5f9fde..cc872300265 100644 --- a/board/st/stm32h743-eval/stm32h743-eval.c +++ b/board/st/stm32h743-eval/stm32h743-eval.c @@ -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; diff --git a/board/st/stm32h750-art-pi/stm32h750-art-pi.c b/board/st/stm32h750-art-pi/stm32h750-art-pi.c index 5785b2e5750..0ece8e79f20 100644 --- a/board/st/stm32h750-art-pi/stm32h750-art-pi.c +++ b/board/st/stm32h750-art-pi/stm32h750-art-pi.c @@ -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; diff --git a/board/ti/panda/panda.c b/board/ti/panda/panda.c index fda8d5f3c83..d8062997e5c 100644 --- a/board/ti/panda/panda.c +++ b/board/ti/panda/panda.c @@ -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 diff --git a/board/ti/sdp4430/sdp.c b/board/ti/sdp4430/sdp.c index 4895bfafd80..69726eb9ce0 100644 --- a/board/ti/sdp4430/sdp.c +++ b/board/ti/sdp4430/sdp.c @@ -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 diff --git a/board/toradex/apalis_imx6/apalis_imx6.c b/board/toradex/apalis_imx6/apalis_imx6.c index 74060daaddd..f4cd28d49f9 100644 --- a/board/toradex/apalis_imx6/apalis_imx6.c +++ b/board/toradex/apalis_imx6/apalis_imx6.c @@ -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); diff --git a/board/toradex/colibri_imx6/colibri_imx6.c b/board/toradex/colibri_imx6/colibri_imx6.c index 587d92a8e99..3b55f6c938e 100644 --- a/board/toradex/colibri_imx6/colibri_imx6.c +++ b/board/toradex/colibri_imx6/colibri_imx6.c @@ -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 diff --git a/board/toradex/common/tdx-cfg-block.c b/board/toradex/common/tdx-cfg-block.c index e4f9a0db914..fe47cddad80 100644 --- a/board/toradex/common/tdx-cfg-block.c +++ b/board/toradex/common/tdx-cfg-block.c @@ -493,24 +493,24 @@ static int get_cfgblock_interactive(void) else tdx_hw_tag.prodid = COLIBRI_PXA270_520MHZ; } -#ifdef CONFIG_MACH_TYPE +#if defined(CONFIG_TARGET_APALIS_T30) || defined(CONFIG_TARGET_COLIBRI_T30) else if (!strcmp("tegra30", soc)) { - if (CONFIG_MACH_TYPE == MACH_TYPE_APALIS_T30) { - if (it == 'y' || it == 'Y') - tdx_hw_tag.prodid = APALIS_T30_IT; - else - if (gd->ram_size == 0x40000000) - tdx_hw_tag.prodid = APALIS_T30_1GB; - else - tdx_hw_tag.prodid = APALIS_T30_2GB; - } else { - if (it == 'y' || it == 'Y') - tdx_hw_tag.prodid = COLIBRI_T30_IT; +#ifdef CONFIG_TARGET_APALIS_T30 + if (it == 'y' || it == 'Y') + tdx_hw_tag.prodid = APALIS_T30_IT; + else + if (gd->ram_size == 0x40000000) + tdx_hw_tag.prodid = APALIS_T30_1GB; else - tdx_hw_tag.prodid = COLIBRI_T30; - } + tdx_hw_tag.prodid = APALIS_T30_2GB; +#else + if (it == 'y' || it == 'Y') + tdx_hw_tag.prodid = COLIBRI_T30_IT; + else + tdx_hw_tag.prodid = COLIBRI_T30; +#endif } -#endif /* CONFIG_MACH_TYPE */ +#endif /* CONFIG_TARGET_APALIS_T30 || CONFIG_TARGET_COLIBRI_T30 */ else if (!strcmp("tegra124", soc)) { tdx_hw_tag.prodid = APALIS_TK1_2GB; } else if (!strcmp("vf500", soc)) { diff --git a/board/toradex/common/tdx-common.c b/board/toradex/common/tdx-common.c index 061abf7537b..9db4553e0f7 100644 --- a/board/toradex/common/tdx-common.c +++ b/board/toradex/common/tdx-common.c @@ -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; } diff --git a/board/toradex/common/tdx-common.h b/board/toradex/common/tdx-common.h index 8020df5b443..c96e8754e9e 100644 --- a/board/toradex/common/tdx-common.h +++ b/board/toradex/common/tdx-common.h @@ -10,6 +10,7 @@ #define TDX_USB_VID 0x1B67 int 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); diff --git a/board/warp7/warp7.c b/board/warp7/warp7.c index 0f202241dd7..c5c5433048d 100644 --- a/board/warp7/warp7.c +++ b/board/warp7/warp7.c @@ -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", diff --git a/configs/am335x_guardian_defconfig b/configs/am335x_guardian_defconfig index 658155f0a63..fe8ddf61e64 100644 --- a/configs/am335x_guardian_defconfig +++ b/configs/am335x_guardian_defconfig @@ -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 diff --git a/configs/am335x_igep003x_defconfig b/configs/am335x_igep003x_defconfig index d41c64e7f08..af94cc090cf 100644 --- a/configs/am335x_igep003x_defconfig +++ b/configs/am335x_igep003x_defconfig @@ -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 diff --git a/configs/apalis-imx8_defconfig b/configs/apalis-imx8_defconfig index 87c9842613b..2c5d6925a03 100644 --- a/configs/apalis-imx8_defconfig +++ b/configs/apalis-imx8_defconfig @@ -35,6 +35,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 diff --git a/configs/apalis-imx8x_defconfig b/configs/apalis-imx8x_defconfig index 6ec13b6515b..4ad6f7fd07a 100644 --- a/configs/apalis-imx8x_defconfig +++ b/configs/apalis-imx8x_defconfig @@ -37,6 +37,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 diff --git a/configs/axm_defconfig b/configs/axm_defconfig index eae53eb3e84..a0133384778 100644 --- a/configs/axm_defconfig +++ b/configs/axm_defconfig @@ -28,7 +28,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -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" diff --git a/configs/cgtqmx8_defconfig b/configs/cgtqmx8_defconfig index f819efae4d6..c7dac3b6053 100644 --- a/configs/cgtqmx8_defconfig +++ b/configs/cgtqmx8_defconfig @@ -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 diff --git a/configs/colibri-imx8x_defconfig b/configs/colibri-imx8x_defconfig index ca966a97942..d9c1e4d6165 100644 --- a/configs/colibri-imx8x_defconfig +++ b/configs/colibri-imx8x_defconfig @@ -33,6 +33,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 diff --git a/configs/corvus_defconfig b/configs/corvus_defconfig index db957a3c65d..72f4310d3cf 100644 --- a/configs/corvus_defconfig +++ b/configs/corvus_defconfig @@ -20,7 +20,7 @@ CONFIG_SPL_SERIAL=y CONFIG_SPL=y CONFIG_ENV_OFFSET_REDUND=0x180000 CONFIG_SYS_LOAD_ADDR=0x70000000 -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" diff --git a/configs/ds109_defconfig b/configs/ds109_defconfig index 135c149c310..d7e865111f4 100644 --- a/configs/ds109_defconfig +++ b/configs/ds109_defconfig @@ -3,6 +3,11 @@ CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_SYS_DCACHE_OFF=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_KIRKWOOD=y +CONFIG_SUPPORT_PASSING_ATAGS=y +CONFIG_CMDLINE_TAG=y +CONFIG_INITRD_TAG=y +CONFIG_STATIC_MACH_TYPE=y +CONFIG_MACH_TYPE=527 CONFIG_SYS_TEXT_BASE=0x600000 CONFIG_NR_DRAM_BANKS=2 CONFIG_TARGET_DS109=y diff --git a/configs/ds414_defconfig b/configs/ds414_defconfig index 3c0960513d6..6402e253d1d 100644 --- a/configs/ds414_defconfig +++ b/configs/ds414_defconfig @@ -1,6 +1,11 @@ CONFIG_ARM=y CONFIG_ARCH_CPU_INIT=y CONFIG_ARCH_MVEBU=y +CONFIG_SUPPORT_PASSING_ATAGS=y +CONFIG_CMDLINE_TAG=y +CONFIG_INITRD_TAG=y +CONFIG_STATIC_MACH_TYPE=y +CONFIG_MACH_TYPE=3036 CONFIG_SYS_TEXT_BASE=0x00800000 CONFIG_SPL_LIBCOMMON_SUPPORT=y CONFIG_SPL_LIBGENERIC_SUPPORT=y diff --git a/configs/gwventana_emmc_defconfig b/configs/gwventana_emmc_defconfig index d1074323daf..000bdb59491 100644 --- a/configs/gwventana_emmc_defconfig +++ b/configs/gwventana_emmc_defconfig @@ -79,6 +79,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 diff --git a/configs/gwventana_gw5904_defconfig b/configs/gwventana_gw5904_defconfig index f579d0fd8d1..87851f35245 100644 --- a/configs/gwventana_gw5904_defconfig +++ b/configs/gwventana_gw5904_defconfig @@ -79,6 +79,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 diff --git a/configs/gwventana_nand_defconfig b/configs/gwventana_nand_defconfig index b587adefb52..ff5001ef961 100644 --- a/configs/gwventana_nand_defconfig +++ b/configs/gwventana_nand_defconfig @@ -81,6 +81,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 diff --git a/configs/icnova-a20-swac_defconfig b/configs/icnova-a20-swac_defconfig index de455608a37..de766b226bb 100644 --- a/configs/icnova-a20-swac_defconfig +++ b/configs/icnova-a20-swac_defconfig @@ -1,5 +1,11 @@ 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_STATIC_MACH_TYPE=y +CONFIG_MACH_TYPE=4283 CONFIG_DEFAULT_DEVICE_TREE="sun7i-a20-icnova-swac" CONFIG_SPL=y CONFIG_MACH_SUN7I=y diff --git a/configs/imx8qm_mek_defconfig b/configs/imx8qm_mek_defconfig index 1aca2173c19..01ba6cffb91 100644 --- a/configs/imx8qm_mek_defconfig +++ b/configs/imx8qm_mek_defconfig @@ -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 diff --git a/configs/imx8qm_rom7720_a1_4G_defconfig b/configs/imx8qm_rom7720_a1_4G_defconfig index 503e000c692..bf7b1f134d4 100644 --- a/configs/imx8qm_rom7720_a1_4G_defconfig +++ b/configs/imx8qm_rom7720_a1_4G_defconfig @@ -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 diff --git a/configs/imx8qxp_mek_defconfig b/configs/imx8qxp_mek_defconfig index 69fb1568f1a..37b6a8259ea 100644 --- a/configs/imx8qxp_mek_defconfig +++ b/configs/imx8qxp_mek_defconfig @@ -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 diff --git a/configs/imx8ulp_evk_defconfig b/configs/imx8ulp_evk_defconfig index 1c6288d3101..f1561008880 100644 --- a/configs/imx8ulp_evk_defconfig +++ b/configs/imx8ulp_evk_defconfig @@ -40,6 +40,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 diff --git a/configs/nokia_rx51_defconfig b/configs/nokia_rx51_defconfig index 82d33710415..69784d972ad 100644 --- a/configs/nokia_rx51_defconfig +++ b/configs/nokia_rx51_defconfig @@ -2,6 +2,12 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=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_STATIC_MACH_TYPE=y +CONFIG_MACH_TYPE=1955 CONFIG_SYS_TEXT_BASE=0x80008000 CONFIG_NR_DRAM_BANKS=2 CONFIG_SYS_MALLOC_LEN=0xc0000 diff --git a/configs/puma-rk3399_defconfig b/configs/puma-rk3399_defconfig index a0a3059a362..afc54fe45cf 100644 --- a/configs/puma-rk3399_defconfig +++ b/configs/puma-rk3399_defconfig @@ -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=1 +CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG=y CONFIG_SPL_DM_SEQ_ALIAS=y CONFIG_ROCKCHIP_GPIO=y CONFIG_SYS_I2C_ROCKCHIP=y diff --git a/configs/stemmy_defconfig b/configs/stemmy_defconfig index 77bc5c71dd2..cf86146696c 100644 --- a/configs/stemmy_defconfig +++ b/configs/stemmy_defconfig @@ -1,6 +1,9 @@ CONFIG_ARM=y CONFIG_SKIP_LOWLEVEL_INIT=y CONFIG_ARCH_U8500=y +CONFIG_SUPPORT_PASSING_ATAGS=y +# CONFIG_SETUP_MEMORY_TAGS is not set +CONFIG_INITRD_TAG=y CONFIG_SYS_TEXT_BASE=0x100000 CONFIG_NR_DRAM_BANKS=2 CONFIG_SYS_MALLOC_LEN=0x0200000 diff --git a/configs/taurus_defconfig b/configs/taurus_defconfig index 19195ad9e4b..0bb28d4d12f 100644 --- a/configs/taurus_defconfig +++ b/configs/taurus_defconfig @@ -30,7 +30,7 @@ CONFIG_SPL_SPI_FLASH_SUPPORT=y CONFIG_SPL_SPI=y CONFIG_DEBUG_UART=y CONFIG_SYS_LOAD_ADDR=0x22000000 -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" diff --git a/configs/warp7_bl33_defconfig b/configs/warp7_bl33_defconfig index e260bbeef5e..d127a4f8d32 100644 --- a/configs/warp7_bl33_defconfig +++ b/configs/warp7_bl33_defconfig @@ -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 diff --git a/configs/warp7_defconfig b/configs/warp7_defconfig index 1b775282864..4b339b47caf 100644 --- a/configs/warp7_defconfig +++ b/configs/warp7_defconfig @@ -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 diff --git a/include/configs/SBx81LIFKW.h b/include/configs/SBx81LIFKW.h index e7c099511d3..fc6167cf969 100644 --- a/include/configs/SBx81LIFKW.h +++ b/include/configs/SBx81LIFKW.h @@ -37,15 +37,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 @@ -60,11 +51,6 @@ #define CONFIG_SYS_MONITOR_LEN (256 << 10) /* Reserve 256 kB for monitor */ -/* - * 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 */ diff --git a/include/configs/SBx81LIFXCAT.h b/include/configs/SBx81LIFXCAT.h index 3e42ef98a71..06be63e2421 100644 --- a/include/configs/SBx81LIFXCAT.h +++ b/include/configs/SBx81LIFXCAT.h @@ -37,15 +37,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 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index b47260d8b29..0f6ffd9ba7c 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -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) diff --git a/include/configs/am335x_guardian.h b/include/configs/am335x_guardian.h index c161b933523..d93db09c9b5 100644 --- a/include/configs/am335x_guardian.h +++ b/include/configs/am335x_guardian.h @@ -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 \ diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index 820bb6a5f15..dff946801c6 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -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) diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index a9c14a1ce28..edfd890767d 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -14,8 +14,6 @@ #include <configs/ti_omap3_common.h> -#define CONFIG_REVISION_TAG - /* Hardware drivers */ /* diff --git a/include/configs/apalis-imx8.h b/include/configs/apalis-imx8.h index cdc7d734e4c..80594548877 100644 --- a/include/configs/apalis-imx8.h +++ b/include/configs/apalis-imx8.h @@ -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 diff --git a/include/configs/apalis-imx8x.h b/include/configs/apalis-imx8x.h index d030242ea73..cd002235ec4 100644 --- a/include/configs/apalis-imx8x.h +++ b/include/configs/apalis-imx8x.h @@ -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 diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 839af489dd8..23fca1e447b 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -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> @@ -23,12 +21,6 @@ #include "imx6_spl.h" #endif -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SERIAL_TAG - #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index 9e5f5236002..eab4f22be34 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -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 diff --git a/include/configs/aristainetos2.h b/include/configs/aristainetos2.h index 69398787d9e..b73b0d5b92b 100644 --- a/include/configs/aristainetos2.h +++ b/include/configs/aristainetos2.h @@ -28,7 +28,6 @@ #include "mx6_common.h" -#define CONFIG_MACH_TYPE 4501 #define CONFIG_MMCROOT "/dev/mmcblk0p1" /* MMC Configs */ diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h index 2c7790eb06c..5177bf20fad 100644 --- a/include/configs/aspeed-common.h +++ b/include/configs/aspeed-common.h @@ -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 diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index e7fc15f48fc..d09a5dbf10f 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -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 /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ @@ -67,24 +64,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 diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index 7b9fa8af80a..fb4695c1abf 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -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_ATMEL_LEGACY /* diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index 9ad41e4ced3..f8df5b0eb7e 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -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 #else #define CONFIG_SYS_USE_NORFLASH diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index c942e7d9e69..78ff5777670 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -18,10 +18,6 @@ #define CONFIG_AT91SAM9M10G45EK -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 683fc73d3b2..4ae6b66a3b2 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -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 /* LCD */ #define LCD_BPP LCD_COLOR16 diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index cdcfb22955a..c703276bcbc 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -16,10 +16,6 @@ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* slow clock xtal */ #define CONFIG_SYS_AT91_MAIN_CLOCK 12000000 /* main clock xtal */ -#define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS 1 -#define CONFIG_INITRD_TAG 1 - #define CONFIG_ATMEL_LEGACY /* diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 5b7634e8000..33481dc0459 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -12,10 +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 - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/baltos.h b/include/configs/baltos.h index bdac5131fc7..2fe6c863939 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -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) diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index e4c6b7fcfc9..7f1c298cdce 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -119,7 +119,6 @@ extern phys_addr_t prior_stage_fdt_address; /* * Informational display configuration. */ -#define CONFIG_REVISION_TAG /* * Command configuration. diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 0daa20ed5ce..8be491e6010 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -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) diff --git a/include/configs/bk4r1.h b/include/configs/bk4r1.h index 921f30612e6..84ea032e2fb 100644 --- a/include/configs/bk4r1.h +++ b/include/configs/bk4r1.h @@ -60,9 +60,6 @@ #include <asm/arch/imx-regs.h> #include <linux/sizes.h> -/* Enable passing of ATAGs */ -#define CONFIG_CMDLINE_TAG - /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index e58026e783b..9fb861b9a0d 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -24,13 +24,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*/ - /* * 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 diff --git a/include/configs/brppt2.h b/include/configs/brppt2.h index e892b6fd404..3f54bafdb88 100644 --- a/include/configs/brppt2.h +++ b/include/configs/brppt2.h @@ -24,10 +24,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 */ diff --git a/include/configs/brsmarc1.h b/include/configs/brsmarc1.h index 404f52d900e..f1e6dbf6135 100644 --- a/include/configs/brsmarc1.h +++ b/include/configs/brsmarc1.h @@ -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 */ @@ -60,11 +58,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 */ diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index cffd9a897d0..d9179760b92 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -23,8 +23,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 */ @@ -57,11 +55,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__ */ diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 8e8b1067b1d..f3416b534b2 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -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) diff --git a/include/configs/cgtqmx8.h b/include/configs/cgtqmx8.h index e6564851c6d..304c876e8b9 100644 --- a/include/configs/cgtqmx8.h +++ b/include/configs/cgtqmx8.h @@ -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" \ diff --git a/include/configs/cm_fx6.h b/include/configs/cm_fx6.h index 2e7d343858c..a22fd0ee1fe 100644 --- a/include/configs/cm_fx6.h +++ b/include/configs/cm_fx6.h @@ -14,7 +14,6 @@ /* Machine config */ #define CONFIG_SYS_LITTLE_ENDIAN -#define CONFIG_MACH_TYPE 4273 /* MMC */ #define CONFIG_SYS_FSL_USDHC_NUM 3 @@ -173,7 +172,6 @@ /* Boot */ #define CONFIG_SYS_BOOTMAPSZ (8 << 20) -#define CONFIG_SERIAL_TAG /* misc */ diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index e6d95b741fb..4ca4f35eb3f 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -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) diff --git a/include/configs/colibri-imx8x.h b/include/configs/colibri-imx8x.h index 1c358eec320..e823497cb39 100644 --- a/include/configs/colibri-imx8x.h +++ b/include/configs/colibri-imx8x.h @@ -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 diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index be0ed457d60..44135b2f214 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -21,12 +21,6 @@ #include "imx6_spl.h" #endif -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_SERIAL_TAG - #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ diff --git a/include/configs/colibri_pxa270.h b/include/configs/colibri_pxa270.h index 0a91784ccf9..08786765d5a 100644 --- a/include/configs/colibri_pxa270.h +++ b/include/configs/colibri_pxa270.h @@ -28,8 +28,6 @@ "fi; " \ "bootm 0xc0000;" #define CONFIG_TIMESTAMP -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS /* * Serial Console Configuration diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 158bb09b37d..e947b58d96c 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -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 diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 30b48c5fd6a..324e607839a 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -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 diff --git a/include/configs/corvus.h b/include/configs/corvus.h index cb9ef6769a5..32f4a10cf56 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -29,10 +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 - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ #define CONFIG_AT91_GPIO_PULLUP 1 /* keep pullups on peripheral pins */ diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index ef2b4f4692c..34683f60c7a 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -177,9 +177,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; " \ diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index 18d9ba1784d..2a020e96c40 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -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 */ diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index f32e18b7625..c2340b26507 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -12,8 +12,6 @@ #include <linux/sizes.h> #include <asm/arch/cpu.h> -#define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT3250 - /* * Memory configurations */ @@ -109,12 +107,6 @@ * U-Boot Commands */ -/* - * Boot Linux - */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS - #define CONFIG_BOOTFILE "uImage" /* diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h index 9c59fd82543..a2a1d93faa9 100644 --- a/include/configs/devkit8000.h +++ b/include/configs/devkit8000.h @@ -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 @@ -34,8 +33,6 @@ #include <configs/ti_omap3_common.h> -#define CONFIG_REVISION_TAG 1 - /* Hardware drivers */ /* DM9000 */ #define CONFIG_NET_RETRY_COUNT 20 diff --git a/include/configs/dh_imx6.h b/include/configs/dh_imx6.h index e31f726ca40..7af8fceb71a 100644 --- a/include/configs/dh_imx6.h +++ b/include/configs/dh_imx6.h @@ -27,11 +27,6 @@ /* Miscellaneous configurable options */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - /* Bootcounter */ #define CONFIG_SYS_BOOTCOUNT_BE diff --git a/include/configs/display5.h b/include/configs/display5.h index 82ef8b00b41..27854dfdf1e 100644 --- a/include/configs/display5.h +++ b/include/configs/display5.h @@ -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 - #define CONFIG_MXC_UART_BASE UART5_BASE /* I2C Configs */ diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 3a943e448bb..18ff1bb9e58 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -13,11 +13,6 @@ #define _CONFIG_DNS325_H /* - * Machine number definition - */ -#define CONFIG_MACH_TYPE MACH_TYPE_DNS325 - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ diff --git a/include/configs/draco.h b/include/configs/draco.h index 6bc7a0b43ea..29ce3a59404 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -12,8 +12,6 @@ #ifndef __CONFIG_DRACO_H #define __CONFIG_DRACO_H -#define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_DRACO - #include "siemens-am33x-common.h" #define DDR_PLL_FREQ 303 diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 65962ee7330..5b71f70c94b 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -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" diff --git a/include/configs/ds109.h b/include/configs/ds109.h index f232abe430e..62fe1441210 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -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) */ diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 3b74aa96cd1..58ecc5f699d 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -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) */ diff --git a/include/configs/ea-lpc3250devkitv2.h b/include/configs/ea-lpc3250devkitv2.h index 857cf487b34..220c3c44d6b 100644 --- a/include/configs/ea-lpc3250devkitv2.h +++ b/include/configs/ea-lpc3250devkitv2.h @@ -13,7 +13,6 @@ /* * SoC and board defines */ -#define CONFIG_MACH_TYPE MACH_TYPE_LPC3XXX #define CONFIG_BOARD_SIZE_LIMIT 0x000fffff /* maximum allowable size for full U-Boot binary */ /* diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index ca9fd133035..fbe468010bf 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -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 */ /* diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index 8f8b4722c77..80108fc8995 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -15,9 +15,6 @@ /* The first stage boot loader takes care of low level initialization. */ -/* Set our official architecture number. */ -#define CONFIG_MACH_TYPE MACH_TYPE_ETHERNUT5 - /* CPU information */ /* ARM asynchronous clock */ @@ -122,9 +119,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" diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 9c778da7e08..95aaa747e4b 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -22,10 +22,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 - /* select serial console configuration */ /* PWM */ diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index 2ca14d0b86e..52dcf7a3bc4 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -14,8 +14,6 @@ #define CONFIG_BOARD_COMMON -#define CONFIG_REVISION_TAG - /* SD/MMC configuration */ #define CONFIG_MMC_DEFAULT_DEV 0 diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h index 65da3815fbd..36c3a613eb7 100644 --- a/include/configs/exynos5250-common.h +++ b/include/configs/exynos5250-common.h @@ -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 diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h index 2d362f39615..7762c77164a 100644 --- a/include/configs/exynos5420-common.h +++ b/include/configs/exynos5420-common.h @@ -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 diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 7d877c1fd99..6c3b2c4bf55 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -17,17 +17,10 @@ /* 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 */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_REVISION_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* * Hardware drivers */ diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index ef672a27b7d..0eeffd46377 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -19,11 +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 - /* SATA Configs */ #ifdef CONFIG_CMD_SATA #define CONFIG_SYS_SATA_MAX_DEVICE 1 diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h index 52b4b356ac5..29a446c2f5d 100644 --- a/include/configs/grpeach.h +++ b/include/configs/grpeach.h @@ -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 diff --git a/include/configs/gw_ventana.h b/include/configs/gw_ventana.h index 012c9b6ffef..f0289582609 100644 --- a/include/configs/gw_ventana.h +++ b/include/configs/gw_ventana.h @@ -24,11 +24,6 @@ #include "imx6_spl.h" /* common IMX6 SPL configuration */ #include "mx6_common.h" -#define CONFIG_MACH_TYPE 4520 /* Gateworks Ventana Platform */ - -/* Serial ATAG */ -#define CONFIG_SERIAL_TAG - /* Serial */ #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/harmony.h b/include/configs/harmony.h index b2464f90dea..5a1e72c5373 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -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 diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 29491327f5c..1a716dfbe91 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -14,11 +14,6 @@ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ #define CONFIG_KW88F6281 /* SOC Name */ -/* - * Machine type - */ -#define CONFIG_MACH_TYPE MACH_TYPE_ICONNECT - #include "mv-common.h" /* diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 5078d0cc438..27aab38926d 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -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 */ diff --git a/include/configs/imx8mq_evk.h b/include/configs/imx8mq_evk.h index ff4f7898431..9b9d6fd6513 100644 --- a/include/configs/imx8mq_evk.h +++ b/include/configs/imx8mq_evk.h @@ -42,8 +42,6 @@ #undef CONFIG_DM_MMC -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG - #define CONFIG_POWER_PFUZE100 #define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 #endif diff --git a/include/configs/imx8mq_phanbell.h b/include/configs/imx8mq_phanbell.h index c04c0191f98..0ec1f69fdbc 100644 --- a/include/configs/imx8mq_phanbell.h +++ b/include/configs/imx8mq_phanbell.h @@ -38,8 +38,6 @@ #define CONFIG_SPL_ABORT_ON_RAW_IMAGE #undef CONFIG_DM_MMC - -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #endif #define CONFIG_REMAKE_ELF diff --git a/include/configs/imx8qm_mek.h b/include/configs/imx8qm_mek.h index c294a99b14e..152fa6f1c27 100644 --- a/include/configs/imx8qm_mek.h +++ b/include/configs/imx8qm_mek.h @@ -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 diff --git a/include/configs/imx8qm_rom7720.h b/include/configs/imx8qm_rom7720.h index 392628a1e39..89b45546adc 100644 --- a/include/configs/imx8qm_rom7720.h +++ b/include/configs/imx8qm_rom7720.h @@ -24,7 +24,6 @@ #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG /* FUSE command */ /* Boot M4 */ diff --git a/include/configs/imx8qxp_mek.h b/include/configs/imx8qxp_mek.h index 4e7532ec50a..a7ca48f1f6b 100644 --- a/include/configs/imx8qxp_mek.h +++ b/include/configs/imx8qxp_mek.h @@ -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 diff --git a/include/configs/imx8ulp_evk.h b/include/configs/imx8ulp_evk.h index 1621b047d78..8e9a159e9b3 100644 --- a/include/configs/imx8ulp_evk.h +++ b/include/configs/imx8ulp_evk.h @@ -33,8 +33,6 @@ #endif -#define CONFIG_SERIAL_TAG - #define CONFIG_REMAKE_ELF #define CONFIG_BOARD_EARLY_INIT_F diff --git a/include/configs/integrator-common.h b/include/configs/integrator-common.h index cf988341263..b573bdc64f6 100644 --- a/include/configs/integrator-common.h +++ b/include/configs/integrator-common.h @@ -8,9 +8,6 @@ #define CONFIG_SYS_TIMERBASE 0x13000100 /* Timer1 */ -#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 diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index 19543bc2b6f..cca624ea3e1 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -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 */ @@ -55,15 +53,6 @@ "" /* - * 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 */ #define CONFIG_SYS_MAX_NAND_DEVICE 1 diff --git a/include/configs/kp_imx6q_tpc.h b/include/configs/kp_imx6q_tpc.h index bbdd53ea8d1..8471dffe832 100644 --- a/include/configs/kp_imx6q_tpc.h +++ b/include/configs/kp_imx6q_tpc.h @@ -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 /* FEC ethernet */ #define CONFIG_ARP_TIMEOUT 200UL diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 8fe3cad77a7..c3f690c7d70 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -8,14 +8,9 @@ #define __KZM9G_H #define CONFIG_SH73A0 -#define CONFIG_MACH_TYPE MACH_TYPE_KZM9G #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 diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 6b6f0d63b49..146d8ad6372 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -7,27 +7,6 @@ #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) */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index 9565f7c2226..69281792019 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -60,8 +60,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 " \ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index d926449a54e..7a7640a49c7 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -147,8 +147,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 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index 2f03a9d314b..a164796dd87 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -387,8 +387,6 @@ unsigned long get_board_sys_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 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 6d225d94999..067d4f725d8 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -233,8 +233,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 diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index e7a2bcb7dbc..4ef4cacd97d 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -365,8 +365,6 @@ unsigned long get_board_sys_clk(void); * Environment */ -#define CONFIG_CMDLINE_TAG - #include <asm/fsl_secure_boot.h> #endif /* __LS1043AQDS_H__ */ diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 6f96b9cae51..b6bbc01304a 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -377,8 +377,6 @@ unsigned long get_board_sys_clk(void); * Environment */ -#define CONFIG_CMDLINE_TAG - #undef CONFIG_BOOTCOMMAND #ifdef CONFIG_TFABOOT #define IFC_NAND_BOOTCOMMAND "run distro_bootcmd; run nand_bootcmd; " \ diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 00c0c8fc026..7294a3c20a5 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -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 diff --git a/include/configs/m53menlo.h b/include/configs/m53menlo.h index 34c8da2fcf4..813d326cdaf 100644 --- a/include/configs/m53menlo.h +++ b/include/configs/m53menlo.h @@ -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 */ @@ -130,10 +129,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_BOOTCOMMAND "run mmc_mmc" diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 162e02fb446..3457c598857 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -32,11 +32,6 @@ #define CONFIG_SYS_AT91_MAIN_CLOCK 16000000/* 16.0 MHz crystal */ /* Misc CPU related */ -#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 diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index 440776fcb73..6023f8128ef 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -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 diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h index c98d79498de..c58545be04b 100644 --- a/include/configs/mt7629.h +++ b/include/configs/mt7629.h @@ -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 diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 052d4b9ca57..65d7dd1430f 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -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 */ /* diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 3380d9efb59..755f59eee98 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -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 */ /* diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index b1078552263..beecf1838e4 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -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 */ /* diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index 0314f349c06..b0c78d3561c 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -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 */ diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index d82dbc1df22..1f40d98be00 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -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 */ diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index f5f1ab0854a..10292c86fac 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -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 */ diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 065e8c7f3b1..9cc297da30e 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -16,12 +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 /* * Hardware drivers */ diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 432e380cca6..f03e4252976 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -14,14 +14,8 @@ #include <asm/arch/imx-regs.h> -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - #define CONFIG_SYS_FSL_CLK -#define CONFIG_REVISION_TAG - #define CONFIG_MXC_UART_BASE UART2_BASE #define CONFIG_FPGA_COUNT 1 diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 50fc9625d02..b026c6ff89f 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -9,18 +9,10 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define CONFIG_MACH_TYPE MACH_TYPE_MX53_LOCO - #include <asm/arch/imx-regs.h> -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - #define CONFIG_SYS_FSL_CLK -#define CONFIG_REVISION_TAG - #define CONFIG_MXC_UART_BASE UART1_BASE /* MMC Configs */ diff --git a/include/configs/mx53ppd.h b/include/configs/mx53ppd.h index 6dd169a0701..b6232422567 100644 --- a/include/configs/mx53ppd.h +++ b/include/configs/mx53ppd.h @@ -11,14 +11,8 @@ #include <asm/arch/imx-regs.h> -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - #define CONFIG_SYS_FSL_CLK -#define CONFIG_REVISION_TAG - /* USB Configs */ #define CONFIG_USB_HOST_ETHER #define CONFIG_USB_ETHER_ASIX diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 71ffcc236bf..5c0b729ccd9 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -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 - /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 512 #define CONFIG_SYS_MAXARGS 32 diff --git a/include/configs/mx6sabreauto.h b/include/configs/mx6sabreauto.h index 1bfc0354271..5cd51a4af06 100644 --- a/include/configs/mx6sabreauto.h +++ b/include/configs/mx6sabreauto.h @@ -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" diff --git a/include/configs/mx6sabresd.h b/include/configs/mx6sabresd.h index a9f353d9b13..9a9f5884aac 100644 --- a/include/configs/mx6sabresd.h +++ b/include/configs/mx6sabresd.h @@ -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" diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index 4bfeff11ffb..e8fd2126f7b 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -14,8 +14,6 @@ #include "imx6_spl.h" #endif -#define CONFIG_MACH_TYPE MACH_TYPE_MX6SL_EVK - #define CONFIG_MXC_UART_BASE UART1_IPS_BASE_ADDR /* MMC Configs */ diff --git a/include/configs/mx7ulp_com.h b/include/configs/mx7ulp_com.h index f02f3ad04d7..48172de1d0f 100644 --- a/include/configs/mx7ulp_com.h +++ b/include/configs/mx7ulp_com.h @@ -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 - /* UART */ #define LPUART_BASE LPUART4_RBASE diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index edc26b0e1a0..567a037089d 100644 --- a/include/configs/mx7ulp_evk.h +++ b/include/configs/mx7ulp_evk.h @@ -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*/ - /* UART */ #define LPUART_BASE LPUART4_RBASE diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 2348accae6d..64f017ab77f 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -84,10 +84,6 @@ #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* Boot argument buffer size */ -/* Booting Linux */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS - /* * Drivers */ diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 1a43587c40a..be022204aa4 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -12,11 +12,6 @@ #define _CONFIG_NAS220_H /* - * Machine type ID - */ -#define CONFIG_MACH_TYPE MACH_TYPE_RD88F6192_NAS - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_FEROCEON_88FR131 /* #define CPU Core subversion */ diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index d704b82969c..cd53c498975 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -11,8 +11,6 @@ #include "mx6_common.h" -#define CONFIG_MACH_TYPE 3769 - #define CONFIG_USBD_HS #define CONFIG_MXC_UART_BASE UART2_BASE diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index 4ff797baa69..b37e05406e9 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -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> @@ -34,11 +32,6 @@ #define V_OSCK 26000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) -#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 */ - #define CONFIG_UBI_SIZE (512 << 10) /* diff --git a/include/configs/odroid.h b/include/configs/odroid.h index 384885aa5ed..281922af4a8 100644 --- a/include/configs/odroid.h +++ b/include/configs/odroid.h @@ -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 @@ -171,6 +169,4 @@ */ #define CONFIG_MISC_COMMON -#undef CONFIG_REVISION_TAG - #endif /* __CONFIG_H */ diff --git a/include/configs/odroid_xu3.h b/include/configs/odroid_xu3.h index fc70dc6a732..70481b5d0c8 100644 --- a/include/configs/odroid_xu3.h +++ b/include/configs/odroid_xu3.h @@ -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 diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h index 6563335f91d..5d300b13f34 100644 --- a/include/configs/omap3_beagle.h +++ b/include/configs/omap3_beagle.h @@ -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 diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index e2e871a9cb6..52a22a97584 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -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 diff --git a/include/configs/omap3_igep00x0.h b/include/configs/omap3_igep00x0.h index 8dc30be8b72..0fee2ed921c 100644 --- a/include/configs/omap3_igep00x0.h +++ b/include/configs/omap3_igep00x0.h @@ -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) diff --git a/include/configs/omap3_logic.h b/include/configs/omap3_logic.h index ca5229cd2fe..886f2e9d86f 100644 --- a/include/configs/omap3_logic.h +++ b/include/configs/omap3_logic.h @@ -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 */ diff --git a/include/configs/omap4_sdp4430.h b/include/configs/omap4_sdp4430.h index 462aa4a5b90..fb210ce69b3 100644 --- a/include/configs/omap4_sdp4430.h +++ b/include/configs/omap4_sdp4430.h @@ -15,7 +15,6 @@ /* * High Level Configuration Options */ -#define CONFIG_MACH_TYPE MACH_TYPE_OMAP_4430SDP #include <configs/ti_omap4_common.h> diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 66bb00065fc..f60d15b9db1 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -170,9 +170,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; " diff --git a/include/configs/origen.h b/include/configs/origen.h index d63de28bfec..881df2d3b0b 100644 --- a/include/configs/origen.h +++ b/include/configs/origen.h @@ -19,8 +19,6 @@ #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE #define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */ -#define CONFIG_MACH_TYPE MACH_TYPE_ORIGEN - #define CONFIG_SYS_MEM_TOP_HIDE (1 << 20) /* ram console */ #define CONFIG_SYS_MONITOR_BASE 0x00000000 diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 7a09ac0dee7..c12f4d0937d 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -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" diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 6b9436e2b20..5b2e084a224 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -12,9 +12,6 @@ #include <linux/sizes.h> #include <linux/stringify.h> -/* Enable passing of ATAGs */ -#define CONFIG_CMDLINE_TAG - /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION diff --git a/include/configs/pdu001.h b/include/configs/pdu001.h index 53342ce193a..3d18747f9b6 100644 --- a/include/configs/pdu001.h +++ b/include/configs/pdu001.h @@ -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) diff --git a/include/configs/phycore_am335x_r2.h b/include/configs/phycore_am335x_r2.h index 4a347fe154f..4925fcc8cfd 100644 --- a/include/configs/phycore_am335x_r2.h +++ b/include/configs/phycore_am335x_r2.h @@ -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" \ diff --git a/include/configs/pico-imx8mq.h b/include/configs/pico-imx8mq.h index 6c642391509..d858a7edf8d 100644 --- a/include/configs/pico-imx8mq.h +++ b/include/configs/pico-imx8mq.h @@ -38,8 +38,6 @@ #define CONFIG_SPL_ABORT_ON_RAW_IMAGE #undef CONFIG_DM_MMC - -#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #endif #define CONFIG_REMAKE_ELF diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 62a2a8f6aa4..1523eff3353 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -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 \ @@ -128,10 +126,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 - /* * Hardware drivers */ diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index d93d23ccfc0..cf74e0e94e4 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -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 | \ @@ -140,10 +138,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 - #define CONFIG_USER_LOWLEVEL_INIT 1 /* diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 5803ab55d3f..c22f698d31d 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -19,10 +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 - /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index ef51da394d1..f49bcfb6a21 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -13,11 +13,6 @@ #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) */ #define CONFIG_FEROCEON_88FR131 /* CPU Core subversion */ diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h index f52ea014b5d..23de326e720 100644 --- a/include/configs/puma_rk3399.h +++ b/include/configs/puma_rk3399.h @@ -10,6 +10,4 @@ #define SDRAM_BANK_SIZE (2UL << 30) -#define CONFIG_SERIAL_TAG - #endif diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index 1438130bf01..a333326dff6 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -13,8 +13,6 @@ #ifndef __CONFIG_PXM2_H #define __CONFIG_PXM2_H -#define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_PXM2 - #include "siemens-am33x-common.h" #define DDR_IOCTRL_VAL 0x18b diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 6bf1889140a..595482c22e9 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -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 diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 7c89fc15616..2b3e1bb0d1c 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -21,10 +21,6 @@ /* boot option */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* Generic Interrupt Controller Definitions */ #define GICD_BASE 0xF1010000 #define GICC_BASE 0xF1020000 diff --git a/include/configs/rpi.h b/include/configs/rpi.h index 71b91b54e7f..55768a46da2 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -22,21 +22,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 @@ -85,11 +70,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" \ diff --git a/include/configs/rut.h b/include/configs/rut.h index d240d8e1d3f..68d68d084d2 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -13,8 +13,6 @@ #ifndef __CONFIG_RUT_H #define __CONFIG_RUT_H -#define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_RUT - #include "siemens-am33x-common.h" #define RUT_IOCTRL_VAL 0x18b diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 85c6e065d33..b4a3cc0445c 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -26,11 +26,6 @@ /* Text Base */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG -#define CONFIG_REVISION_TAG -#define CONFIG_INITRD_TAG - /* MMC */ #define SDHCI_MAX_HOSTS 4 diff --git a/include/configs/sam9x60ek.h b/include/configs/sam9x60ek.h index 7d0768fa347..774ecb41938 100644 --- a/include/configs/sam9x60ek.h +++ b/include/configs/sam9x60ek.h @@ -14,10 +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_USART_BASE ATMEL_BASE_DBGU #define CONFIG_USART_ID 0 /* ignored in arm */ diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 5b5aa1b2f20..c51517a76bf 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -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 */ diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 79226865ec7..6ccba95f305 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -18,14 +18,6 @@ #define CONFIG_DMA_COHERENT #define CONFIG_DMA_COHERENT_SIZE (1 << 20) -#ifdef CONFIG_SIEMENS_MACH_TYPE -#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 diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 03260c33358..5bcc3a66d3a 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -40,15 +40,11 @@ #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 */ /* We set the max number of command args high to avoid HUSH bugs. */ #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 diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 84c647957c3..a5edf04a432 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -29,10 +29,6 @@ /* Text Base */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_CMDLINE_TAG -#define CONFIG_INITRD_TAG - /* * select serial console configuration */ diff --git a/include/configs/smdkv310.h b/include/configs/smdkv310.h index dd2a549606a..4a6b6258ab7 100644 --- a/include/configs/smdkv310.h +++ b/include/configs/smdkv310.h @@ -12,14 +12,10 @@ #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 */ -/* Mach Type */ -#define CONFIG_MACH_TYPE MACH_TYPE_SMDKV310 - #define CONFIG_SYS_SDRAM_BASE 0x40000000 /* Handling Sleep Mode*/ diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index c5d2c1d889a..32abeb03fb4 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -20,10 +20,6 @@ /* CPU */ -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* SDRAM */ #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS1 #define CONFIG_SYS_SDRAM_SIZE (64 * 1024 * 1024) /* 64MB */ diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 9b582782c60..b13584da51c 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -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 /* SDRAM */ #define CONFIG_SYS_SDRAM_BASE ATMEL_BASE_CS6 diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 267a1b851c9..7c563b7b045 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -99,16 +99,6 @@ "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 */ diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index 73317afc314..0b37efeafa3 100644 --- a/include/configs/socfpga_arria5_secu1.h +++ b/include/configs/socfpga_arria5_secu1.h @@ -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 */ diff --git a/include/configs/stemmy.h b/include/configs/stemmy.h index b250a53e602..e5571b240dc 100644 --- a/include/configs/stemmy.h +++ b/include/configs/stemmy.h @@ -19,9 +19,6 @@ #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 - /* Linux does not boot if FDT / initrd is loaded to end of RAM */ #define BOOT_ENV \ "fdt_high=0x6000000\0" \ diff --git a/include/configs/stih410-b2260.h b/include/configs/stih410-b2260.h index 34a408a1033..b1917c9d3f5 100644 --- a/include/configs/stih410-b2260.h +++ b/include/configs/stih410-b2260.h @@ -43,8 +43,6 @@ /* Extra Commands */ -#define CONFIG_SETUP_MEMORY_TAGS - #define CONFIG_SYS_GBL_DATA_SIZE 1024 /* Global data structures */ #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE - \ CONFIG_SYS_MALLOC_LEN - \ diff --git a/include/configs/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index f47932df00e..525a5277d86 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-discovery.h @@ -25,11 +25,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_BOOTCOMMAND \ diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h index 51b2de2f21b..609b4c2c3be 100644 --- a/include/configs/stm32f429-evaluation.h +++ b/include/configs/stm32f429-evaluation.h @@ -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 BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h index 0c4ac64c0fe..a8f6fbf9cff 100644 --- a/include/configs/stm32f469-discovery.h +++ b/include/configs/stm32f469-discovery.h @@ -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 BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 15bc43b489f..c76d290a57d 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -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 BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h index f5620554d17..c43b0d82853 100644 --- a/include/configs/stm32h743-disco.h +++ b/include/configs/stm32h743-disco.h @@ -18,11 +18,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 BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h index d4f37a34e36..d838449452a 100644 --- a/include/configs/stm32h743-eval.h +++ b/include/configs/stm32h743-eval.h @@ -18,11 +18,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 BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/stm32h750-art-pi.h b/include/configs/stm32h750-art-pi.h index f35a0cedabd..db17939a8c8 100644 --- a/include/configs/stm32h750-art-pi.h +++ b/include/configs/stm32h750-art-pi.h @@ -18,11 +18,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 BOOT_TARGET_DEVICES(func) \ diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index 1ac1cac8d3a..4ccaab5b473 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -27,11 +27,6 @@ */ #define CONFIG_SYS_CBSIZE SZ_1K -/* 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. diff --git a/include/configs/sun4i.h b/include/configs/sun4i.h index 6033760583a..0e1baa91bb1 100644 --- a/include/configs/sun4i.h +++ b/include/configs/sun4i.h @@ -16,6 +16,4 @@ */ #include <configs/sunxi-common.h> -#define CONFIG_MACH_TYPE (4104 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28)) - #endif /* __CONFIG_H */ diff --git a/include/configs/sun5i.h b/include/configs/sun5i.h index ee42af80d46..ada18de7537 100644 --- a/include/configs/sun5i.h +++ b/include/configs/sun5i.h @@ -16,6 +16,4 @@ */ #include <configs/sunxi-common.h> -#define CONFIG_MACH_TYPE (4138 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28)) - #endif /* __CONFIG_H */ diff --git a/include/configs/sun7i.h b/include/configs/sun7i.h index d2fd5866723..803a7514cc0 100644 --- a/include/configs/sun7i.h +++ b/include/configs/sun7i.h @@ -20,6 +20,4 @@ */ #include <configs/sunxi-common.h> -#define CONFIG_MACH_TYPE (4283 | ((CONFIG_MACH_TYPE_COMPAT_REV) << 28)) - #endif /* __CONFIG_H */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 44612305557..f7d0a7ef95c 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -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 @@ -105,11 +89,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 diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 5fafee280b2..166b8397ada 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -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 - /* * DDR related */ diff --git a/include/configs/taurus.h b/include/configs/taurus.h index 2ae167fd42a..23f1e378e62 100644 --- a/include/configs/taurus.h +++ b/include/configs/taurus.h @@ -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 /* general purpose I/O */ #define CONFIG_ATMEL_LEGACY /* required until (g)pio is fixed */ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index acc6e6cffc5..0438b5ae0c6 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -12,8 +12,6 @@ /* General configuration */ -#define CONFIG_MACH_TYPE 3980 - #define CONFIG_SYS_HZ 1000 /* Physical Memory Map */ diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index 2bc531c463e..f8e741ab6fc 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -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 */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 432eceaf351..673056ce517 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -22,8 +22,6 @@ #define CONFIG_SYS_TIMER_COUNTER NV_PA_TMRUS_BASE #endif -#define CONFIG_CMDLINE_TAG /* enable passing of ATAGs */ - /* Environment */ /* diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index 20848a6b19f..ee63ce37cd9 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -18,12 +18,6 @@ #include <asm/arch/omap.h> -#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 \ diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index c8f5a0763bb..cffa79416f9 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -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" \ diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index a6b724e889c..fa48cd2818c 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -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 - /* * We setup defaults based on constraints from the Linux kernel, which should * also be safe elsewhere. We have the default load at 32MB into DDR (for diff --git a/include/configs/trats.h b/include/configs/trats.h index 7284663f04e..396e9f28100 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -26,8 +26,6 @@ #define PHYS_SDRAM_1 CONFIG_SYS_SDRAM_BASE #define SDRAM_BANK_SIZE (256 << 20) /* 256 MB */ -#define CONFIG_MACH_TYPE MACH_TYPE_TRATS - #define CONFIG_BOOTCOMMAND "run autoboot" #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR \ diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index b914e444b6e..b562d44a13b 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -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 */ diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 2990b529c00..0bbc9847537 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -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 */ /* diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 14b532502b7..fe6ea68dd46 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -12,9 +12,6 @@ #include "imx6_spl.h" -/* Provide the MACH_TYPE value that the vendor kernel requires. */ -#define CONFIG_MACH_TYPE 4800 - #define CONFIG_MXC_UART_BASE UART2_BASE /* SATA Configs */ diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index c9c72c94ce2..c12e53690d0 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -20,12 +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_CMDLINE_TAG /* enable passing of ATAGs */ -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* * Hardware drivers */ diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 21f90f38fc9..0bd5a1e8522 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -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" diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index d7d98cd03f8..25088da8ed5 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -108,12 +108,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 #define SCTL_BASE V2M_SYSCTL #define VEXPRESS_FLASHPROG_FLVPPEN (1 << 0) diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index b005db8278e..49053ce2d79 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -13,11 +13,6 @@ #define CONFIG_SYS_FSL_CLK -#define CONFIG_MACH_TYPE 4146 - -/* Enable passing of ATAGs */ -#define CONFIG_CMDLINE_TAG - /* NAND support */ #define CONFIG_SYS_NAND_ONFI_DETECTION diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index f9226888c27..ece762e512d 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -12,8 +12,6 @@ #include "imx6_spl.h" -#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD_IMX6 - #define CONFIG_MXC_UART_BASE UART1_BASE /* SATA Configs */ diff --git a/include/configs/warp7.h b/include/configs/warp7.h index bb9ba373eb4..0822eaf5557 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -18,9 +18,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" \ diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index aa307be06ac..83b24a7dcc8 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -14,12 +14,6 @@ #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 - -/* * Memory configurations */ #define CONFIG_SYS_SDRAM_BASE EMC_DYCS0_BASE @@ -80,9 +74,6 @@ /* * Boot Linux */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 8b4b0bfd189..46596e921a0 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -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 */ @@ -26,10 +25,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 */ |