diff options
33 files changed, 1 insertions, 223 deletions
diff --git a/arch/arm/mach-imx/imx8/cpu.c b/arch/arm/mach-imx/imx8/cpu.c index 911d6a5..31fbe63 100644 --- a/arch/arm/mach-imx/imx8/cpu.c +++ b/arch/arm/mach-imx/imx8/cpu.c @@ -171,37 +171,6 @@ enum boot_device get_boot_device(void) return boot_dev; } -#ifdef CONFIG_SERIAL_TAG -#define FUSE_UNIQUE_ID_WORD0 16 -#define FUSE_UNIQUE_ID_WORD1 17 -void get_board_serial(struct tag_serialnr *serialnr) -{ - sc_err_t err; - u32 val1 = 0, val2 = 0; - u32 word1, word2; - - if (!serialnr) - return; - - word1 = FUSE_UNIQUE_ID_WORD0; - word2 = FUSE_UNIQUE_ID_WORD1; - - err = sc_misc_otp_fuse_read(-1, word1, &val1); - if (err != SC_ERR_NONE) { - printf("%s fuse %d read error: %d\n", __func__, word1, err); - return; - } - - err = sc_misc_otp_fuse_read(-1, word2, &val2); - if (err != SC_ERR_NONE) { - printf("%s fuse %d read error: %d\n", __func__, word2, err); - return; - } - serialnr->low = val1; - serialnr->high = val2; -} -#endif /*CONFIG_SERIAL_TAG*/ - #ifdef CONFIG_ENV_IS_IN_MMC __weak int board_mmc_get_env_dev(int devno) { diff --git a/arch/arm/mach-imx/mx7/soc.c b/arch/arm/mach-imx/mx7/soc.c index fda25ba..2601ae8 100644 --- a/arch/arm/mach-imx/mx7/soc.c +++ b/arch/arm/mach-imx/mx7/soc.c @@ -161,13 +161,6 @@ u32 get_cpu_rev(void) return (type << 12) | reg; } -#ifdef CONFIG_REVISION_TAG -u32 __weak get_board_rev(void) -{ - return get_cpu_rev(); -} -#endif - static void imx_enet_mdio_fixup(void) { struct iomuxc_gpr_base_regs *gpr_regs = @@ -351,40 +344,6 @@ int arch_misc_init(void) } #endif -#ifdef CONFIG_SERIAL_TAG -/* - * OCOTP_TESTER - * i.MX 7Solo Applications Processor Reference Manual, Rev. 0.1, 08/2016 - * OCOTP_TESTER describes a unique ID based on silicon wafer - * and die X/Y position - * - * OCOTOP_TESTER offset 0x410 - * 31:0 fuse 0 - * FSL-wide unique, encoded LOT ID STD II/SJC CHALLENGE/ Unique ID - * - * OCOTP_TESTER1 offset 0x420 - * 31:24 fuse 1 - * The X-coordinate of the die location on the wafer/SJC CHALLENGE/ Unique ID - * 23:16 fuse 1 - * The Y-coordinate of the die location on the wafer/SJC CHALLENGE/ Unique ID - * 15:11 fuse 1 - * The wafer number of the wafer on which the device was fabricated/SJC - * CHALLENGE/ Unique ID - * 10:0 fuse 1 - * FSL-wide unique, encoded LOT ID STD II/SJC CHALLENGE/ Unique ID - */ -void get_board_serial(struct tag_serialnr *serialnr) -{ - struct ocotp_regs *ocotp = (struct ocotp_regs *)OCOTP_BASE_ADDR; - struct fuse_bank *bank = &ocotp->bank[0]; - struct fuse_bank0_regs *fuse = - (struct fuse_bank0_regs *)bank->fuse_regs; - - serialnr->low = fuse->tester0; - serialnr->high = fuse->tester1; -} -#endif - void set_wdog_reset(struct wdog_regs *wdog) { u32 reg = readw(&wdog->wcr); diff --git a/arch/arm/mach-imx/mx7ulp/soc.c b/arch/arm/mach-imx/mx7ulp/soc.c index 8dd6b4d..c0e7c39 100644 --- a/arch/arm/mach-imx/mx7ulp/soc.c +++ b/arch/arm/mach-imx/mx7ulp/soc.c @@ -49,13 +49,6 @@ u32 get_cpu_rev(void) return (MXC_CPU_MX7ULP << 12) | (rom_version & 0xFF); } -#ifdef CONFIG_REVISION_TAG -u32 __weak get_board_rev(void) -{ - return get_cpu_rev(); -} -#endif - enum bt_mode get_boot_mode(void) { u32 bt0_cfg = 0; diff --git a/board/friendlyarm/nanopi2/board.c b/board/friendlyarm/nanopi2/board.c index 6898053..397c230 100644 --- a/board/friendlyarm/nanopi2/board.c +++ b/board/friendlyarm/nanopi2/board.c @@ -294,7 +294,6 @@ static void set_ether_addr(void) env_set("ethaddr", ethaddr); } -#ifdef CONFIG_REVISION_TAG static void set_board_rev(void) { char info[64] = {0, }; @@ -302,7 +301,6 @@ static void set_board_rev(void) snprintf(info, ARRAY_SIZE(info), "%02x", get_board_rev()); env_set("board_rev", info); } -#endif static void set_dtb_name(void) { @@ -435,9 +433,8 @@ int board_late_init(void) { bd_update_env(); -#ifdef CONFIG_REVISION_TAG set_board_rev(); -#endif + set_dtb_name(); set_ether_addr(); diff --git a/board/samsung/common/misc.c b/board/samsung/common/misc.c index 837463b..2e3fd1a 100644 --- a/board/samsung/common/misc.c +++ b/board/samsung/common/misc.c @@ -90,10 +90,8 @@ void set_board_info(void) snprintf(info, ARRAY_SIZE(info), "%x", s5p_cpu_id); env_set("soc_id", info); -#ifdef CONFIG_REVISION_TAG snprintf(info, ARRAY_SIZE(info), "%x", get_board_rev()); env_set("board_rev", info); -#endif #ifdef CONFIG_OF_LIBFDT const char *bdtype = ""; const char *bdname = CONFIG_SYS_BOARD; @@ -235,9 +233,7 @@ static void display_board_info(void) #ifdef CONFIG_SYS_BOARD lcd_printf("\tBoard name: %s\n", CONFIG_SYS_BOARD); #endif -#ifdef CONFIG_REVISION_TAG lcd_printf("\tBoard rev: %u\n", get_board_rev()); -#endif lcd_printf("\tDRAM banks: %u\n", CONFIG_NR_DRAM_BANKS); lcd_printf("\tDRAM size: %u MB\n", gd->ram_size / SZ_1M); diff --git a/board/theobroma-systems/puma_rk3399/puma-rk3399.c b/board/theobroma-systems/puma_rk3399/puma-rk3399.c index deeba30..3237a6a 100644 --- a/board/theobroma-systems/puma_rk3399/puma-rk3399.c +++ b/board/theobroma-systems/puma_rk3399/puma-rk3399.c @@ -136,19 +136,3 @@ int misc_init_r(void) return 0; } - -#ifdef CONFIG_SERIAL_TAG -void get_board_serial(struct tag_serialnr *serialnr) -{ - char *serial_string; - u64 serial = 0; - - serial_string = env_get("serial#"); - - if (serial_string) - serial = simple_strtoull(serial_string, NULL, 16); - - serialnr->high = (u32)(serial >> 32); - serialnr->low = (u32)(serial & 0xffffffff); -} -#endif diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h index df0f5d2..8d666c6 100644 --- a/include/configs/aspeed-common.h +++ b/include/configs/aspeed-common.h @@ -12,11 +12,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 #ifdef CONFIG_PRE_CON_BUF_SZ diff --git a/include/configs/bcmstb.h b/include/configs/bcmstb.h index 2660d18..5dbef0e 100644 --- a/include/configs/bcmstb.h +++ b/include/configs/bcmstb.h @@ -117,12 +117,6 @@ extern phys_addr_t prior_stage_fdt_address; */ #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600, \ 115200} - -/* - * Informational display configuration. - */ -#define CONFIG_REVISION_TAG - /* * Command configuration. */ diff --git a/include/configs/grpeach.h b/include/configs/grpeach.h index 4d5eab0..3087cab 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/ls1021aiot.h b/include/configs/ls1021aiot.h index cf4d60a..cf49cc1 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -175,8 +175,6 @@ #define CONFIG_PCI_SCAN_SHOW #endif -#define CONFIG_CMDLINE_TAG - #define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_LAYERSCAPE_NS_ACCESS #define CONFIG_SMP_PEN_ADDR 0x01ee0200 diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index eb6f1c1..26b8f87 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -422,8 +422,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_PCI_SCAN_SHOW #endif -#define CONFIG_CMDLINE_TAG - #define CONFIG_PEN_ADDR_BIG_ENDIAN #define CONFIG_LAYERSCAPE_NS_ACCESS #define CONFIG_SMP_PEN_ADDR 0x01ee0200 diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index 3e85bb3..dd08850 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -260,8 +260,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 1636f0b..f2addac 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -391,12 +391,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_TEXT_BASE /* start of monitor */ #endif -/* - * 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 9102c81..06e54db 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -410,8 +410,6 @@ unsigned long get_board_ddr_clk(void); * Environment */ -#define CONFIG_CMDLINE_TAG - #undef CONFIG_BOOTCOMMAND #ifdef CONFIG_TFABOOT #define IFC_NAND_BOOTCOMMAND "run distro_bootcmd; run nand_bootcmd; " \ diff --git a/include/configs/mt7623.h b/include/configs/mt7623.h index 9895279..613e96e 100644 --- a/include/configs/mt7623.h +++ b/include/configs/mt7623.h @@ -12,10 +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 #define CONFIG_SYS_CBSIZE SZ_1K diff --git a/include/configs/mt7629.h b/include/configs/mt7629.h index 08a4d01..af9a5bb 100644 --- a/include/configs/mt7629.h +++ b/include/configs/mt7629.h @@ -12,10 +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 #define CONFIG_SYS_CBSIZE SZ_1K diff --git a/include/configs/mvebu_armada-37xx.h b/include/configs/mvebu_armada-37xx.h index 0d58560..84772d9 100644 --- a/include/configs/mvebu_armada-37xx.h +++ b/include/configs/mvebu_armada-37xx.h @@ -20,15 +20,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/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 38f5046..fc42cfd 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/mx7ulp_com.h b/include/configs/mx7ulp_com.h index 28672c4..7ac445d 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 - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (8 * SZ_1M) diff --git a/include/configs/mx7ulp_evk.h b/include/configs/mx7ulp_evk.h index 0c31030..78b41c7 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*/ - /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (8 * SZ_1M) diff --git a/include/configs/puma_rk3399.h b/include/configs/puma_rk3399.h index f52ea01..23de326 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/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index b9762f5..34f3005 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -17,12 +17,6 @@ #define CONFIG_SPL_TARGET "spl/u-boot-spl.scif" #endif -/* boot option */ - -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* Generic Interrupt Controller Definitions */ #define CONFIG_GICV2 #define GICD_BASE 0xF1010000 diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 275d92e..b6fba31 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -34,9 +34,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT -/* Enable passing of ATAGs */ -#define CONFIG_CMDLINE_TAG - /* SMP Spin Table Definitions */ #define CPU_RELEASE_ADDR (CONFIG_SYS_SDRAM_BASE + 0x7fff0) diff --git a/include/configs/socfpga_arria5_secu1.h b/include/configs/socfpga_arria5_secu1.h index c25d6bd..90d4bb5 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/stm32f429-discovery.h b/include/configs/stm32f429-discovery.h index 9d029fb..dbbce49 100644 --- a/include/configs/stm32f429-discovery.h +++ b/include/configs/stm32f429-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 CONFIG_SYS_MALLOC_LEN (2 << 20) diff --git a/include/configs/stm32f429-evaluation.h b/include/configs/stm32f429-evaluation.h index fefdb2d..29a41e8 100644 --- a/include/configs/stm32f429-evaluation.h +++ b/include/configs/stm32f429-evaluation.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 CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) diff --git a/include/configs/stm32f469-discovery.h b/include/configs/stm32f469-discovery.h index ba9f05a..b9b932c 100644 --- a/include/configs/stm32f469-discovery.h +++ b/include/configs/stm32f469-discovery.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 CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index 08d050a..b72b989 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -36,11 +36,6 @@ #define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_SYS_CBSIZE 1024 #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) diff --git a/include/configs/stm32h743-disco.h b/include/configs/stm32h743-disco.h index 6e10dbd..e5bb08e 100644 --- a/include/configs/stm32h743-disco.h +++ b/include/configs/stm32h743-disco.h @@ -24,11 +24,6 @@ #define CONFIG_SYS_HZ_CLOCK 1000000 -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) diff --git a/include/configs/stm32h743-eval.h b/include/configs/stm32h743-eval.h index 268d39c..89169f8 100644 --- a/include/configs/stm32h743-eval.h +++ b/include/configs/stm32h743-eval.h @@ -24,11 +24,6 @@ #define CONFIG_SYS_HZ_CLOCK 1000000 -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG -#define CONFIG_REVISION_TAG - #define CONFIG_SYS_MAXARGS 16 #define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) diff --git a/include/configs/stm32mp1.h b/include/configs/stm32mp1.h index 863b652..e2e8a5d 100644 --- a/include/configs/stm32mp1.h +++ b/include/configs/stm32mp1.h @@ -33,11 +33,6 @@ #define CONFIG_LOADADDR 0xc2000000 #define CONFIG_SYS_LOAD_ADDR CONFIG_LOADADDR -/* ATAGs */ -#define CONFIG_CMDLINE_TAG -#define CONFIG_SETUP_MEMORY_TAGS -#define CONFIG_INITRD_TAG - /* * For booting Linux, use the first 256 MB of memory, since this is * the maximum mapped by the Linux kernel during initialization. diff --git a/include/configs/turris_mox.h b/include/configs/turris_mox.h index 51445ec..721a78b 100644 --- a/include/configs/turris_mox.h +++ b/include/configs/turris_mox.h @@ -25,15 +25,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/warp7.h b/include/configs/warp7.h index 8eb1060..3ab42ff 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -21,9 +21,6 @@ #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 -/* Switch on SERIAL_TAG */ -#define CONFIG_SERIAL_TAG - #define CONFIG_DFU_ENV_SETTINGS \ "dfu_alt_info=boot raw 0x2 0x1000 mmcpart 1\0" \ |