diff options
Diffstat (limited to 'include/configs')
381 files changed, 784 insertions, 1258 deletions
diff --git a/include/configs/B4860QDS.h b/include/configs/B4860QDS.h index 4267d81d95..2fdb869383 100644 --- a/include/configs/B4860QDS.h +++ b/include/configs/B4860QDS.h @@ -674,7 +674,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* CONFIG_PCI */ #ifdef CONFIG_FMAN_ENET diff --git a/include/configs/BSC9131RDB.h b/include/configs/BSC9131RDB.h index db7574d5b5..41162349cf 100644 --- a/include/configs/BSC9131RDB.h +++ b/include/configs/BSC9131RDB.h @@ -298,7 +298,6 @@ extern unsigned long get_sdram_size(void); */ #define CONFIG_CMD_ERRATA #define CONFIG_CMD_IRQ -#define CONFIG_DOS_PARTITION #define CONFIG_CMD_REGINFO /* diff --git a/include/configs/BSC9132QDS.h b/include/configs/BSC9132QDS.h index 4c55da401c..942123b828 100644 --- a/include/configs/BSC9132QDS.h +++ b/include/configs/BSC9132QDS.h @@ -96,7 +96,6 @@ #define CONFIG_SYS_PCIE1_IO_PHYS 0xC0010000 #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif #define CONFIG_ENV_OVERWRITE @@ -477,9 +476,7 @@ combinations. this should be removed later #endif /* CONFIG_TSEC_ENET */ #ifdef CONFIG_MMC -#define CONFIG_DOS_PARTITION #define CONFIG_FSL_ESDHC -#define CONFIG_GENERIC_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif @@ -534,10 +531,6 @@ combinations. this should be removed later #define CONFIG_CMD_IRQ #define CONFIG_CMD_REGINFO -#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) -#define CONFIG_DOS_PARTITION -#endif - /* Hash command with SHA acceleration supported in hardware */ #ifdef CONFIG_FSL_CAAM #define CONFIG_CMD_HASH diff --git a/include/configs/C29XPCIE.h b/include/configs/C29XPCIE.h index 269cd49648..8f68748d87 100644 --- a/include/configs/C29XPCIE.h +++ b/include/configs/C29XPCIE.h @@ -96,7 +96,6 @@ #define CONFIG_SYS_PCIE1_IO_PHYS 0xfffc00000ull #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif #define CONFIG_TSEC_ENET diff --git a/include/configs/CPCI4052.h b/include/configs/CPCI4052.h index da3edfaa4a..07dac8af21 100644 --- a/include/configs/CPCI4052.h +++ b/include/configs/CPCI4052.h @@ -69,9 +69,6 @@ #define CONFIG_CMD_BSP #define CONFIG_CMD_EEPROM -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION - #define CONFIG_SUPPORT_VFAT #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 6230948c44..98ccbe3d92 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -92,9 +92,6 @@ /* USB */ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION -#define CONFIG_ISO_PARTITION #define CONFIG_SYS_USB_EHCI_REGS_BASE 0xFC0B0000 #define CONFIG_SYS_USB_EHCI_CPU_INIT #endif diff --git a/include/configs/M5253DEMO.h b/include/configs/M5253DEMO.h index 6c90700ccf..273345772a 100644 --- a/include/configs/M5253DEMO.h +++ b/include/configs/M5253DEMO.h @@ -42,8 +42,6 @@ #ifdef CONFIG_CMD_IDE /* ATA */ -# define CONFIG_DOS_PARTITION -# define CONFIG_MAC_PARTITION # define CONFIG_IDE_RESET 1 # define CONFIG_IDE_PREINIT 1 # define CONFIG_ATAPI diff --git a/include/configs/M5253EVBE.h b/include/configs/M5253EVBE.h index faad9703b7..5cba541fe3 100644 --- a/include/configs/M5253EVBE.h +++ b/include/configs/M5253EVBE.h @@ -50,8 +50,6 @@ #define CONFIG_CMD_IDE /* ATA */ -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION #define CONFIG_IDE_RESET 1 #define CONFIG_IDE_PREINIT 1 #define CONFIG_ATAPI diff --git a/include/configs/M54455EVB.h b/include/configs/M54455EVB.h index abec3737a4..0eed59e0d6 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -119,8 +119,6 @@ #endif /* ATA configuration */ -#define CONFIG_ISO_PARTITION -#define CONFIG_DOS_PARTITION #define CONFIG_IDE_RESET 1 #define CONFIG_IDE_PREINIT 1 #define CONFIG_ATAPI diff --git a/include/configs/M5475EVB.h b/include/configs/M5475EVB.h index 3b40cd00c8..f10c3f0b9f 100644 --- a/include/configs/M5475EVB.h +++ b/include/configs/M5475EVB.h @@ -75,7 +75,6 @@ # define CONFIG_CMD_PCI # endif # define CONFIG_PCI_OHCI -# define CONFIG_DOS_PARTITION # undef CONFIG_SYS_USB_OHCI_BOARD_INIT # undef CONFIG_SYS_USB_OHCI_CPU_INIT diff --git a/include/configs/M5485EVB.h b/include/configs/M5485EVB.h index 2c18e98bfe..2ae8d2534e 100644 --- a/include/configs/M5485EVB.h +++ b/include/configs/M5485EVB.h @@ -69,7 +69,6 @@ #endif #ifdef CONFIG_CMD_USB -# define CONFIG_DOS_PARTITION # define CONFIG_USB_OHCI_NEW # ifndef CONFIG_CMD_PCI # define CONFIG_CMD_PCI diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 61d6fd080d..b59c53ef82 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -326,9 +326,6 @@ /************************************************************ * DISK Partition support ************************************************************/ -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION -#define CONFIG_ISO_PARTITION /* Experimental */ /************************************************************ * Video support diff --git a/include/configs/MPC8308RDB.h b/include/configs/MPC8308RDB.h index 7107a47f34..4dbc2ba772 100644 --- a/include/configs/MPC8308RDB.h +++ b/include/configs/MPC8308RDB.h @@ -25,9 +25,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_USE_PIO - -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* diff --git a/include/configs/MPC8315ERDB.h b/include/configs/MPC8315ERDB.h index 2e3e44c20f..fb8d51e241 100644 --- a/include/configs/MPC8315ERDB.h +++ b/include/configs/MPC8315ERDB.h @@ -417,7 +417,6 @@ #ifdef CONFIG_FSL_SATA #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif /* diff --git a/include/configs/MPC8349ITX.h b/include/configs/MPC8349ITX.h index 5f7eca05fa..fcc1a73f81 100644 --- a/include/configs/MPC8349ITX.h +++ b/include/configs/MPC8349ITX.h @@ -487,7 +487,6 @@ boards, we say we have two, but don't display a message if we find only one. */ #if defined(CONFIG_COMPACT_FLASH) || defined(CONFIG_SATA_SIL3114) \ || defined(CONFIG_USB_STORAGE) - #define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_VFAT #endif diff --git a/include/configs/MPC837XEMDS.h b/include/configs/MPC837XEMDS.h index a8cb186d24..4239f779a2 100644 --- a/include/configs/MPC837XEMDS.h +++ b/include/configs/MPC837XEMDS.h @@ -438,7 +438,6 @@ extern int board_pci_host_broken(void); #ifdef CONFIG_FSL_SATA #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif /* @@ -486,8 +485,6 @@ extern int board_pci_host_broken(void); #define CONFIG_FSL_ESDHC #define CONFIG_FSL_ESDHC_PIN_MUX #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* diff --git a/include/configs/MPC837XERDB.h b/include/configs/MPC837XERDB.h index 7754ec72da..370e381f98 100644 --- a/include/configs/MPC837XERDB.h +++ b/include/configs/MPC837XERDB.h @@ -450,7 +450,6 @@ #ifdef CONFIG_FSL_SATA #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif /* @@ -498,8 +497,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_FSL_ESDHC_PIN_MUX #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* diff --git a/include/configs/MPC8536DS.h b/include/configs/MPC8536DS.h index 8c42d72f6a..b9eab4e382 100644 --- a/include/configs/MPC8536DS.h +++ b/include/configs/MPC8536DS.h @@ -523,7 +523,6 @@ #ifdef CONFIG_FSL_SATA #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif #if defined(CONFIG_TSEC_ENET) @@ -603,7 +602,6 @@ #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR -#define CONFIG_GENERIC_MMC #endif /* @@ -619,10 +617,6 @@ #endif #endif -#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) -#define CONFIG_DOS_PARTITION -#endif - /* * Miscellaneous configurable options */ diff --git a/include/configs/MPC8544DS.h b/include/configs/MPC8544DS.h index b9c62e1e94..5d76996865 100644 --- a/include/configs/MPC8544DS.h +++ b/include/configs/MPC8544DS.h @@ -282,7 +282,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #endif #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #define CONFIG_SCSI_AHCI #ifdef CONFIG_SCSI_AHCI diff --git a/include/configs/MPC8569MDS.h b/include/configs/MPC8569MDS.h index baee4a06e0..91e17d9399 100644 --- a/include/configs/MPC8569MDS.h +++ b/include/configs/MPC8569MDS.h @@ -461,8 +461,6 @@ extern unsigned long get_clock_freq(void); #define CONFIG_FSL_ESDHC #define CONFIG_FSL_ESDHC_PIN_MUX #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* diff --git a/include/configs/MPC8572DS.h b/include/configs/MPC8572DS.h index d7b136615f..3d4c8a8102 100644 --- a/include/configs/MPC8572DS.h +++ b/include/configs/MPC8572DS.h @@ -470,7 +470,6 @@ #endif #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #define CONFIG_SCSI_AHCI #ifdef CONFIG_SCSI_AHCI diff --git a/include/configs/MPC8610HPCD.h b/include/configs/MPC8610HPCD.h index 1178661635..742714871d 100644 --- a/include/configs/MPC8610HPCD.h +++ b/include/configs/MPC8610HPCD.h @@ -285,7 +285,6 @@ #define PCI_IDSEL_NUMBER 0x0c /* slot0->3(IDSEL)=12->15 */ #endif -#define CONFIG_DOS_PARTITION #define CONFIG_SCSI_AHCI #ifdef CONFIG_SCSI_AHCI diff --git a/include/configs/MPC8641HPCN.h b/include/configs/MPC8641HPCN.h index fb66bb6897..0e5bbc0012 100644 --- a/include/configs/MPC8641HPCN.h +++ b/include/configs/MPC8641HPCN.h @@ -374,7 +374,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #undef CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #define CONFIG_SCSI_AHCI #ifdef CONFIG_SCSI_AHCI diff --git a/include/configs/P1010RDB.h b/include/configs/P1010RDB.h index 83bb2ccf1a..cf574da7c3 100644 --- a/include/configs/P1010RDB.h +++ b/include/configs/P1010RDB.h @@ -192,7 +192,6 @@ #endif #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif #define CONFIG_TSEC_ENET @@ -668,9 +667,7 @@ extern unsigned long get_sdram_size(void); #endif /* #ifdef CONFIG_FSL_SATA */ #ifdef CONFIG_MMC -#define CONFIG_DOS_PARTITION #define CONFIG_FSL_ESDHC -#define CONFIG_GENERIC_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif @@ -743,7 +740,6 @@ extern unsigned long get_sdram_size(void); #if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) \ || defined(CONFIG_FSL_SATA) -#define CONFIG_DOS_PARTITION #endif /* Hash command with SHA acceleration supported in hardware */ diff --git a/include/configs/P1022DS.h b/include/configs/P1022DS.h index 70dcd9b321..e601cc64bd 100644 --- a/include/configs/P1022DS.h +++ b/include/configs/P1022DS.h @@ -499,19 +499,13 @@ #ifdef CONFIG_FSL_SATA #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC -#define CONFIG_GENERIC_MMC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #endif -#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) -#define CONFIG_DOS_PARTITION -#endif - #define CONFIG_TSEC_ENET #ifdef CONFIG_TSEC_ENET diff --git a/include/configs/P1023RDB.h b/include/configs/P1023RDB.h index 7b10625b54..58a3507dc1 100644 --- a/include/configs/P1023RDB.h +++ b/include/configs/P1023RDB.h @@ -258,7 +258,6 @@ extern unsigned long get_clock_freq(void); #ifdef CONFIG_USB_EHCI #define CONFIG_EHCI_HCD_INIT_AFTER_RESET #define CONFIG_USB_EHCI_FSL -#define CONFIG_DOS_PARTITION #endif #endif diff --git a/include/configs/P2041RDB.h b/include/configs/P2041RDB.h index e22b1f5afc..3fad88f62c 100644 --- a/include/configs/P2041RDB.h +++ b/include/configs/P2041RDB.h @@ -532,7 +532,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* CONFIG_PCI */ /* SATA */ @@ -552,7 +551,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif #ifdef CONFIG_FMAN_ENET @@ -607,8 +605,6 @@ unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* Hash command with SHA acceleration supported in hardware */ diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index 35f04ffe41..ab7ac2b122 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -284,9 +284,6 @@ /************************************************************ * DISK Partition support ************************************************************/ -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION -#define CONFIG_ISO_PARTITION /* Experimental */ /************************************************************ * Video support diff --git a/include/configs/PLU405.h b/include/configs/PLU405.h index 91450624d4..397e933cf5 100644 --- a/include/configs/PLU405.h +++ b/include/configs/PLU405.h @@ -63,9 +63,6 @@ #define CONFIG_CMD_DATE #define CONFIG_CMD_EEPROM -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION - #define CONFIG_SUPPORT_VFAT #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index d4207d7438..5ea82f8e4d 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -258,9 +258,6 @@ #define USB_2_0_DEVICE /* Partitions */ -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION #define CONFIG_CMD_BSP #define CONFIG_CMD_DATE diff --git a/include/configs/T102xQDS.h b/include/configs/T102xQDS.h index 669a09487c..fcaa803c4e 100644 --- a/include/configs/T102xQDS.h +++ b/include/configs/T102xQDS.h @@ -619,7 +619,6 @@ unsigned long get_board_ddr_clk(void); #endif #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* CONFIG_PCI */ /* @@ -635,7 +634,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_SATA1_FLAGS FLAGS_DMA #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif /* @@ -655,8 +653,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* Qman/Bman */ diff --git a/include/configs/T102xRDB.h b/include/configs/T102xRDB.h index 57e0cfa07b..e46bf007ad 100644 --- a/include/configs/T102xRDB.h +++ b/include/configs/T102xRDB.h @@ -638,7 +638,6 @@ unsigned long get_board_ddr_clk(void); #endif #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* CONFIG_PCI */ /* @@ -658,8 +657,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* Qman/Bman */ diff --git a/include/configs/T1040QDS.h b/include/configs/T1040QDS.h index 385e7abc29..2d436c2900 100644 --- a/include/configs/T1040QDS.h +++ b/include/configs/T1040QDS.h @@ -503,7 +503,6 @@ unsigned long get_board_ddr_clk(void); #endif #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* CONFIG_PCI */ /* SATA */ @@ -522,7 +521,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif /* @@ -543,8 +541,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_FSL_ESDHC #define CONFIG_FSL_ESDHC_USE_PERIPHERAL_CLK #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #define CONFIG_FSL_ESDHC_ADAPTER_IDENT #endif diff --git a/include/configs/T104xRDB.h b/include/configs/T104xRDB.h index bcb8edaa0d..9306b73408 100644 --- a/include/configs/T104xRDB.h +++ b/include/configs/T104xRDB.h @@ -617,7 +617,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #endif #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* CONFIG_PCI */ /* SATA */ @@ -633,7 +632,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif /* @@ -653,8 +651,6 @@ $(SRCTREE)/board/freescale/t104xrdb/t1042d4_sd_rcw.cfg #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* Qman/Bman */ diff --git a/include/configs/T208xQDS.h b/include/configs/T208xQDS.h index 9ec326abca..0a65d0e864 100644 --- a/include/configs/T208xQDS.h +++ b/include/configs/T208xQDS.h @@ -590,7 +590,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata */ #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* Qman/Bman */ @@ -701,7 +700,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_SATA2_FLAGS FLAGS_DMA #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif /* @@ -722,8 +720,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #define CONFIG_FSL_ESDHC_ADAPTER_IDENT #endif diff --git a/include/configs/T208xRDB.h b/include/configs/T208xRDB.h index b11423447c..f833732038 100644 --- a/include/configs/T208xRDB.h +++ b/include/configs/T208xRDB.h @@ -528,7 +528,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_FSL_PCIE_RESET /* need PCIe reset errata LSZ ADD */ #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* Qman/Bman */ @@ -651,7 +650,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_SATA2_FLAGS FLAGS_DMA #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif /* @@ -671,8 +669,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* diff --git a/include/configs/T4240QDS.h b/include/configs/T4240QDS.h index 78ad86c4a6..2bcb362121 100644 --- a/include/configs/T4240QDS.h +++ b/include/configs/T4240QDS.h @@ -493,7 +493,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif #ifdef CONFIG_FMAN_ENET @@ -520,8 +519,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #define CONFIG_ESDHC_DETECT_QUIRK \ (!(readb(QIXIS_BASE + QIXIS_BRDCFG5) & QIXIS_MUX_SDHC) || \ diff --git a/include/configs/T4240RDB.h b/include/configs/T4240RDB.h index 9136bf036e..dbb9fd4da1 100644 --- a/include/configs/T4240RDB.h +++ b/include/configs/T4240RDB.h @@ -240,7 +240,6 @@ #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* CONFIG_PCI */ /* SATA */ @@ -258,7 +257,6 @@ #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif #ifdef CONFIG_FMAN_ENET @@ -680,7 +678,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif #ifdef CONFIG_FMAN_ENET @@ -701,8 +698,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 #endif diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index 405efadfdd..495fdc83b9 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -107,9 +107,6 @@ #endif /* #ifndef CONFIG_TQM5200S */ /* Partitions */ -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION /* USB */ #if defined(CONFIG_CHARON) || defined(CONFIG_FO300) || \ diff --git a/include/configs/TQM823L.h b/include/configs/TQM823L.h index 41879f85df..bd58247b70 100644 --- a/include/configs/TQM823L.h +++ b/include/configs/TQM823L.h @@ -87,9 +87,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION - #define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */ /* diff --git a/include/configs/TQM823M.h b/include/configs/TQM823M.h index ad5c922bfb..9d056cd8fb 100644 --- a/include/configs/TQM823M.h +++ b/include/configs/TQM823M.h @@ -85,9 +85,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION - #define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */ /* diff --git a/include/configs/TQM850L.h b/include/configs/TQM850L.h index 03c7cb9921..225b3a82b4 100644 --- a/include/configs/TQM850L.h +++ b/include/configs/TQM850L.h @@ -80,9 +80,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION - #define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */ /* diff --git a/include/configs/TQM850M.h b/include/configs/TQM850M.h index 3c716ce1a5..022a9cab31 100644 --- a/include/configs/TQM850M.h +++ b/include/configs/TQM850M.h @@ -80,9 +80,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION - #define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */ /* diff --git a/include/configs/TQM855L.h b/include/configs/TQM855L.h index c4c90aa0bf..aa7704cb26 100644 --- a/include/configs/TQM855L.h +++ b/include/configs/TQM855L.h @@ -82,9 +82,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION - #define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */ /* diff --git a/include/configs/TQM855M.h b/include/configs/TQM855M.h index 56e2a457aa..5efd69de66 100644 --- a/include/configs/TQM855M.h +++ b/include/configs/TQM855M.h @@ -111,9 +111,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION - #define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */ /* diff --git a/include/configs/TQM860L.h b/include/configs/TQM860L.h index 1875609d07..b7151b34be 100644 --- a/include/configs/TQM860L.h +++ b/include/configs/TQM860L.h @@ -82,9 +82,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION - #define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */ /* diff --git a/include/configs/TQM860M.h b/include/configs/TQM860M.h index 15df1da9e6..9efe5d0f27 100644 --- a/include/configs/TQM860M.h +++ b/include/configs/TQM860M.h @@ -82,9 +82,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION - #define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */ /* diff --git a/include/configs/TQM862L.h b/include/configs/TQM862L.h index b3b072298a..dc4dbaf885 100644 --- a/include/configs/TQM862L.h +++ b/include/configs/TQM862L.h @@ -85,9 +85,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION - #define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */ /* diff --git a/include/configs/TQM862M.h b/include/configs/TQM862M.h index 45f10e596f..2c0cd827f9 100644 --- a/include/configs/TQM862M.h +++ b/include/configs/TQM862M.h @@ -85,9 +85,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION - #define CONFIG_RTC_MPC8xx /* use internal RTC of MPC8xx */ /* diff --git a/include/configs/TQM866M.h b/include/configs/TQM866M.h index 8f3efec379..a7a1aa82d1 100644 --- a/include/configs/TQM866M.h +++ b/include/configs/TQM866M.h @@ -123,9 +123,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION - #undef CONFIG_RTC_MPC8xx /* MPC866 does not support RTC */ #define CONFIG_TIMESTAMP /* but print image timestmps */ diff --git a/include/configs/TQM885D.h b/include/configs/TQM885D.h index d75b25dc89..6722050e98 100644 --- a/include/configs/TQM885D.h +++ b/include/configs/TQM885D.h @@ -119,9 +119,6 @@ #define CONFIG_BOOTP_BOOTPATH #define CONFIG_BOOTP_BOOTFILESIZE -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION - #undef CONFIG_RTC_MPC8xx /* MPC885 does not support RTC */ #define CONFIG_TIMESTAMP /* but print image timestmps */ diff --git a/include/configs/UCP1020.h b/include/configs/UCP1020.h index a9b7a5aba9..8082ec5d7c 100644 --- a/include/configs/UCP1020.h +++ b/include/configs/UCP1020.h @@ -377,7 +377,6 @@ #define CONFIG_CMD_PCI #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* CONFIG_PCI */ /* @@ -473,11 +472,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_MMC_SPI #define CONFIG_CMD_MMC_SPI -#define CONFIG_GENERIC_MMC -#endif - -#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) || defined(CONFIG_FSL_SATA) -#define CONFIG_DOS_PARTITION #endif /* Misc Extra Settings */ diff --git a/include/configs/a4m072.h b/include/configs/a4m072.h index b41ebe0e59..f6bf931686 100644 --- a/include/configs/a4m072.h +++ b/include/configs/a4m072.h @@ -60,10 +60,6 @@ #undef CONFIG_EEPRO100 -/* Partitions */ -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION - /* USB */ #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_OHCI_BE_CONTROLLER diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index 2d1c099b97..a7a6bfeaf5 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -396,12 +396,6 @@ #define CONFIG_CMD_PCI #endif -#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2) -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION -#define CONFIG_ISO_PARTITION -#endif /* defined(CONFIG_CMD_IDE) */ - /* * Miscellaneous configurable options */ diff --git a/include/configs/acadia.h b/include/configs/acadia.h index 3e8d48be45..9f35e71d0c 100644 --- a/include/configs/acadia.h +++ b/include/configs/acadia.h @@ -154,9 +154,6 @@ #define CONFIG_USB_OHCI /* Partitions */ -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/adp-ag101p.h b/include/configs/adp-ag101p.h index 93fa6149b0..a2cdd71fd9 100644 --- a/include/configs/adp-ag101p.h +++ b/include/configs/adp-ag101p.h @@ -100,8 +100,6 @@ /* * SD (MMC) controller */ -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #define CONFIG_FTSDC010 #define CONFIG_FTSDC010_NUMBER 1 #define CONFIG_FTSDC010_SDIO diff --git a/include/configs/advantech_dms-ba16.h b/include/configs/advantech_dms-ba16.h index c410544f62..1736426f46 100644 --- a/include/configs/advantech_dms-ba16.h +++ b/include/configs/advantech_dms-ba16.h @@ -52,9 +52,7 @@ #define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_DOS_PARTITION /* USB Configs */ #define CONFIG_USB_EHCI diff --git a/include/configs/alt.h b/include/configs/alt.h index 726e6d6cc1..e338fa9558 100644 --- a/include/configs/alt.h +++ b/include/configs/alt.h @@ -87,8 +87,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* MMCIF */ -#define CONFIG_GENERIC_MMC - #define CONFIG_SH_MMCIF #define CONFIG_SH_MMCIF_ADDR 0xee200000 #define CONFIG_SH_MMCIF_CLK 48000000 diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 7e0aeffe79..d8e6ba3e4f 100644 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -26,8 +26,7 @@ #define CONFIG_SYS_BOOTM_LEN (16 << 20) -#define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */ -#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM +#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ @@ -39,10 +38,6 @@ /* Always 128 KiB env size */ #define CONFIG_ENV_SIZE (128 << 10) -/* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION - #ifdef CONFIG_NAND #define NANDARGS \ "mtdids=" MTDIDS_DEFAULT "\0" \ @@ -300,8 +295,6 @@ #undef CONFIG_ENV_IS_IN_NAND /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ -#undef CONFIG_PARTITION_UUIDS -#undef CONFIG_EFI_PARTITION #endif /* USB Device Firmware Update support */ diff --git a/include/configs/am335x_igep0033.h b/include/configs/am335x_igep0033.h index 16fb1ae8aa..7bf1f3bf59 100644 --- a/include/configs/am335x_igep0033.h +++ b/include/configs/am335x_igep0033.h @@ -18,7 +18,6 @@ #include <configs/ti_am335x_common.h> /* Mach type */ -#define MACH_TYPE_IGEP0033 4521 /* Until the next sync */ #define CONFIG_MACH_TYPE MACH_TYPE_IGEP0033 /* Clock defines */ diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index d780c3f63c..f676822404 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -31,25 +31,6 @@ #define CONFIG_SYS_BOOTM_LEN (16 << 20) -#define MACH_TYPE_BOSCH_SHC_B 9001 -#define MACH_TYPE_BOSCH_SHC_B2 9002 -#define MACH_TYPE_BOSCH_SHC_C 9003 -#define MACH_TYPE_BOSCH_SHC_C2 9004 -#define MACH_TYPE_BOSCH_SHC_C3 9005 -#define MACH_TYPE_BOSCH_SHC 9006 -#ifdef CONFIG_B_SAMPLE -# define CONFIG_MACH_TYPE MACH_TYPE_BOSCH_SHC_B -#elif defined CONFIG_B2_SAMPLE -# define CONFIG_MACH_TYPE MACH_TYPE_BOSCH_SHC_B2 -#elif defined CONFIG_C_SAMPLE -# define CONFIG_MACH_TYPE MACH_TYPE_BOSCH_SHC_C -#elif defined CONFIG_C2_SAMPLE -# define CONFIG_MACH_TYPE MACH_TYPE_BOSCH_SHC_C2 -#elif defined CONFIG_C3_SAMPLE -# define CONFIG_MACH_TYPE MACH_TYPE_BOSCH_SHC_C3 -#elif defined CONFIG_SERIES -# define CONFIG_MACH_TYPE MACH_TYPE_BOSCH_SHC -#endif /* #ifdef CONFIG_B_SAMPLE */ /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK) @@ -80,12 +61,6 @@ #define CONFIG_ENV_OFFSET_REDUND 0x9000 /* 36 kB */ #define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE -/* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION -#ifdef CONFIG_SPL_BUILD -#undef CONFIG_ISO_PARTITION -#endif #ifndef CONFIG_SHC_ICT /* * In builds other than ICT, reset to retry after timeout diff --git a/include/configs/am335x_sl50.h b/include/configs/am335x_sl50.h index b17c00d93f..c277450fbc 100644 --- a/include/configs/am335x_sl50.h +++ b/include/configs/am335x_sl50.h @@ -27,10 +27,6 @@ /* Always 128 KiB env size */ #define CONFIG_ENV_SIZE (128 << 10) -/* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION - #define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG #ifndef CONFIG_SPL_BUILD @@ -98,8 +94,6 @@ /* disable host part of MUSB in SPL */ #undef CONFIG_MUSB_HOST /* disable EFI partitions and partition UUID support */ -#undef CONFIG_PARTITION_UUIDS -#undef CONFIG_EFI_PARTITION #endif #if defined(CONFIG_EMMC_BOOT) diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h index 31b3925b25..5d568604a6 100644 --- a/include/configs/am3517_crane.h +++ b/include/configs/am3517_crane.h @@ -75,8 +75,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} -#define CONFIG_GENERIC_MMC 1 -#define CONFIG_DOS_PARTITION 1 /* * USB configuration diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h index c0d3617aca..13de819245 100644 --- a/include/configs/am3517_evm.h +++ b/include/configs/am3517_evm.h @@ -76,10 +76,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} -/* SD/MMC */ -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - /* * USB configuration * Enable CONFIG_USB_MUSB_HOST for Host functionalities MSC, keyboard @@ -110,7 +106,6 @@ /* commands to include */ #define CONFIG_CMD_NAND -#define CONFIG_CMD_PART #define CONFIG_CMD_MTDPARTS /* I2C */ @@ -259,7 +254,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING #define CONFIG_SYS_LONGHELP -#define CONFIG_PARTITION_UUIDS /* We set the max number of command args high to avoid HUSH bugs. */ #define CONFIG_SYS_MAXARGS 64 diff --git a/include/configs/am43xx_evm.h b/include/configs/am43xx_evm.h index 961ad0a0c8..1d622eff2f 100644 --- a/include/configs/am43xx_evm.h +++ b/include/configs/am43xx_evm.h @@ -164,10 +164,6 @@ #define CONFIG_QSPI_QUAD_SUPPORT #define CONFIG_TI_EDMA3 -/* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION - #ifndef CONFIG_SPL_BUILD #define CONFIG_EXTRA_ENV_SETTINGS \ DEFAULT_LINUX_BOOT_ENV \ diff --git a/include/configs/am57xx_evm.h b/include/configs/am57xx_evm.h index 840502c5b1..3d8b996054 100644 --- a/include/configs/am57xx_evm.h +++ b/include/configs/am57xx_evm.h @@ -68,8 +68,6 @@ #include <configs/ti_omap5_common.h> /* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION #define CONFIG_RANDOM_UUID #define CONFIG_HSMMC2_8BIT diff --git a/include/configs/ap325rxa.h b/include/configs/ap325rxa.h index c86ce05779..053a184293 100644 --- a/include/configs/ap325rxa.h +++ b/include/configs/ap325rxa.h @@ -15,7 +15,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_IDE -#define CONFIG_DOS_PARTITION #define CONFIG_BAUDRATE 38400 #define CONFIG_BOOTARGS "console=ttySC2,38400" diff --git a/include/configs/apalis_imx6.h b/include/configs/apalis_imx6.h index 97c1f1a8ea..8e8892ef00 100644 --- a/include/configs/apalis_imx6.h +++ b/include/configs/apalis_imx6.h @@ -67,10 +67,8 @@ #define CONFIG_SYS_FSL_USDHC_NUM 3 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_FAT_WRITE -#define CONFIG_DOS_PARTITION #ifdef CONFIG_MX6Q #define CONFIG_CMD_SATA diff --git a/include/configs/apalis_t30.h b/include/configs/apalis_t30.h index e645ad201e..e2acc6e8c9 100644 --- a/include/configs/apalis_t30.h +++ b/include/configs/apalis_t30.h @@ -25,9 +25,6 @@ /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC support */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, before config block at the end of 1st "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \ diff --git a/include/configs/apf27.h b/include/configs/apf27.h index 314ac898ea..504bf92ffb 100644 --- a/include/configs/apf27.h +++ b/include/configs/apf27.h @@ -241,7 +241,6 @@ */ #define CONFIG_MTD_DEVICE #define CONFIG_MTD_PARTITIONS -#define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_VFAT /* @@ -308,7 +307,6 @@ * SD/MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_MXC_MCI_REGS_BASE 0x10014000 #endif diff --git a/include/configs/apx4devkit.h b/include/configs/apx4devkit.h index babaf2671e..e8729b93bc 100644 --- a/include/configs/apx4devkit.h +++ b/include/configs/apx4devkit.h @@ -16,12 +16,10 @@ /* System configurations */ #define CONFIG_MX28 /* i.MX28 SoC */ -#define MACH_TYPE_APX4DEVKIT 3712 #define CONFIG_MACH_TYPE MACH_TYPE_APX4DEVKIT /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION #define CONFIG_CMD_DATE #define CONFIG_CMD_NAND diff --git a/include/configs/aria.h b/include/configs/aria.h index f385852cdc..d408d545c1 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -403,12 +403,6 @@ #define CONFIG_CMD_PCI #endif -#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2) -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION -#define CONFIG_ISO_PARTITION -#endif /* defined(CONFIG_CMD_IDE) */ - /* * Dynamic MTD partition support */ diff --git a/include/configs/aspeed-common.h b/include/configs/aspeed-common.h new file mode 100644 index 0000000000..93b57d46c0 --- /dev/null +++ b/include/configs/aspeed-common.h @@ -0,0 +1,81 @@ +/* + * Copyright (C) 2012-2020 ASPEED Technology Inc. + * Ryan Chen <ryan_chen@aspeedtech.com> + * + * Copyright 2016 IBM Corporation + * (C) Copyright 2016 Google, Inc + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __AST_COMMON_CONFIG_H +#define __AST_COMMON_CONFIG_H + +/* Misc CPU related */ +#define CONFIG_CMDLINE_TAG +#define CONFIG_SETUP_MEMORY_TAGS +#define CONFIG_INITRD_TAG + +#define CONFIG_CMDLINE_EDITING + +/* Enable cache controller */ +#define CONFIG_SYS_DCACHE_OFF + +#define CONFIG_SYS_SDRAM_BASE 0x80000000 + +#ifdef CONFIG_PRE_CON_BUF_SZ +#define CONFIG_SYS_INIT_RAM_ADDR (0x1e720000 + CONFIG_PRE_CON_BUF_SZ) +#define CONFIG_SYS_INIT_RAM_SIZE (36*1024 - CONFIG_PRE_CON_BUF_SZ) +#else +#define CONFIG_SYS_INIT_RAM_ADDR (0x1e720000) +#define CONFIG_SYS_INIT_RAM_SIZE (36*1024) +#endif + +#define SYS_INIT_RAM_END (CONFIG_SYS_INIT_RAM_ADDR \ + + CONFIG_SYS_INIT_RAM_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR (SYS_INIT_RAM_END \ + - GENERATED_GBL_DATA_SIZE) + +#define CONFIG_NR_DRAM_BANKS 1 + +#define CONFIG_SYS_MALLOC_LEN (32 << 20) + +/* + * NS16550 Configuration + */ +#define CONFIG_BAUDRATE 115200 + +/* + * BOOTP options + */ +#define CONFIG_BOOTP_BOOTFILESIZE +#define CONFIG_BOOTP_BOOTPATH +#define CONFIG_BOOTP_GATEWAY +#define CONFIG_BOOTP_HOSTNAME +#define CONFIG_BOOTP_SUBNETMASK + +/* + * Miscellaneous configurable options + */ +#define CONFIG_SYS_LONGHELP +#define CONFIG_SYS_CBSIZE 256 + +/* Print Buffer Size */ +#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE \ + + sizeof(CONFIG_SYS_PROMPT) + 16) +#define CONFIG_SYS_MAXARGS 16 +#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE + +#define CONFIG_BOOTARGS \ + "console=ttyS4,115200n8" \ + " root=/dev/ram rw" + +#define CONFIG_BOOTCOMMAND "bootm 20080000 20300000" +#define CONFIG_ENV_OVERWRITE + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "verify=yes\0" \ + "spi_dma=yes\0" \ + "" + +#endif /* __AST_COMMON_CONFIG_H */ diff --git a/include/configs/at91rm9200ek.h b/include/configs/at91rm9200ek.h index 82e2cb7401..9dc33939ce 100644 --- a/include/configs/at91rm9200ek.h +++ b/include/configs/at91rm9200ek.h @@ -142,7 +142,6 @@ #define CONFIG_USB_ATMEL 1 #define CONFIG_USB_ATMEL_CLK_SEL_PLLB #define CONFIG_USB_OHCI_NEW 1 -#define CONFIG_DOS_PARTITION 1 #define CONFIG_SYS_USB_OHCI_CPU_INIT 1 #define CONFIG_SYS_USB_OHCI_REGS_BASE ATMEL_USB_HOST_BASE diff --git a/include/configs/at91sam9260ek.h b/include/configs/at91sam9260ek.h index 95499c8764..022353c7fb 100644 --- a/include/configs/at91sam9260ek.h +++ b/include/configs/at91sam9260ek.h @@ -145,15 +145,9 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #endif -/* FAT */ -#ifdef CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION -#endif - /* NOR flash - no real flash on this board */ #define CONFIG_SYS_NO_FLASH 1 diff --git a/include/configs/at91sam9261ek.h b/include/configs/at91sam9261ek.h index cc37236209..67a721bc2d 100644 --- a/include/configs/at91sam9261ek.h +++ b/include/configs/at91sam9261ek.h @@ -127,7 +127,6 @@ #define CONFIG_USB_ATMEL #define CONFIG_USB_ATMEL_CLK_SEL_PLLB #define CONFIG_USB_OHCI_NEW -#define CONFIG_DOS_PARTITION #define CONFIG_SYS_USB_OHCI_CPU_INIT #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 /* AT91SAM9261_UHP_BASE */ #ifdef CONFIG_AT91SAM9G10EK diff --git a/include/configs/at91sam9263ek.h b/include/configs/at91sam9263ek.h index b8d3791346..1fea328f14 100644 --- a/include/configs/at91sam9263ek.h +++ b/include/configs/at91sam9263ek.h @@ -103,7 +103,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #endif @@ -265,7 +264,6 @@ #define CONFIG_USB_ATMEL #define CONFIG_USB_ATMEL_CLK_SEL_PLLB #define CONFIG_USB_OHCI_NEW 1 -#define CONFIG_DOS_PARTITION 1 #define CONFIG_SYS_USB_OHCI_CPU_INIT 1 #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00a00000 /* AT91SAM9263_UHP_BASE */ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9263" diff --git a/include/configs/at91sam9m10g45ek.h b/include/configs/at91sam9m10g45ek.h index 743153bb18..8577a11f7c 100644 --- a/include/configs/at91sam9m10g45ek.h +++ b/include/configs/at91sam9m10g45ek.h @@ -98,14 +98,9 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #endif -#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC) -#define CONFIG_DOS_PARTITION -#endif - /* Ethernet */ #define CONFIG_MACB #define CONFIG_RMII diff --git a/include/configs/at91sam9n12ek.h b/include/configs/at91sam9n12ek.h index 0b8448c4e3..c4ac21d351 100644 --- a/include/configs/at91sam9n12ek.h +++ b/include/configs/at91sam9n12ek.h @@ -122,15 +122,9 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #endif -/* FAT */ -#ifdef CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION -#endif - /* Ethernet */ #define CONFIG_KS8851_MLL #define CONFIG_KS8851_MLL_BASEADDR 0x30000000 /* use NCS2 */ diff --git a/include/configs/at91sam9rlek.h b/include/configs/at91sam9rlek.h index 3f0bb6e974..4d0e7b48f1 100644 --- a/include/configs/at91sam9rlek.h +++ b/include/configs/at91sam9rlek.h @@ -105,9 +105,7 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI -#define CONFIG_DOS_PARTITION #endif /* Ethernet - not present */ diff --git a/include/configs/at91sam9x5ek.h b/include/configs/at91sam9x5ek.h index 361830bec0..897ffa9a0a 100644 --- a/include/configs/at91sam9x5ek.h +++ b/include/configs/at91sam9x5ek.h @@ -110,15 +110,9 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #endif -/* FAT */ -#ifdef CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION -#endif - /* Ethernet */ #define CONFIG_MACB #define CONFIG_RMII diff --git a/include/configs/atngw100.h b/include/configs/atngw100.h index b0c4a05bcc..d966e1c2a0 100644 --- a/include/configs/atngw100.h +++ b/include/configs/atngw100.h @@ -47,7 +47,6 @@ #define CONFIG_USART_BASE ATMEL_BASE_USART1 #define CONFIG_USART_ID 1 /* User serviceable stuff */ -#define CONFIG_DOS_PARTITION #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS @@ -86,7 +85,6 @@ #define CONFIG_SYS_NR_PIOS 5 #define CONFIG_SYS_HSDRAMC #define CONFIG_GENERIC_ATMEL_MCI -#define CONFIG_GENERIC_MMC #define CONFIG_ATMEL_SPI #define CONFIG_SYS_DCACHE_LINESZ 32 diff --git a/include/configs/atngw100mkii.h b/include/configs/atngw100mkii.h index eb7e0b2249..8a9215e8a8 100644 --- a/include/configs/atngw100mkii.h +++ b/include/configs/atngw100mkii.h @@ -66,7 +66,6 @@ #define CONFIG_USART_ID 1 /* User serviceable stuff */ -#define CONFIG_DOS_PARTITION #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS @@ -105,7 +104,6 @@ #define CONFIG_SYS_NR_PIOS 5 #define CONFIG_SYS_HSDRAMC #define CONFIG_GENERIC_ATMEL_MCI -#define CONFIG_GENERIC_MMC #define CONFIG_ATMEL_SPI #define CONFIG_SYS_DCACHE_LINESZ 32 diff --git a/include/configs/atstk1002.h b/include/configs/atstk1002.h index 2480c3d217..c9a36bc774 100644 --- a/include/configs/atstk1002.h +++ b/include/configs/atstk1002.h @@ -64,7 +64,6 @@ #define CONFIG_USART_ID 1 /* User serviceable stuff */ -#define CONFIG_DOS_PARTITION #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS @@ -107,7 +106,6 @@ #define CONFIG_SYS_NR_PIOS 5 #define CONFIG_SYS_HSDRAMC #define CONFIG_GENERIC_ATMEL_MCI -#define CONFIG_GENERIC_MMC #define CONFIG_SYS_DCACHE_LINESZ 32 #define CONFIG_SYS_ICACHE_LINESZ 32 diff --git a/include/configs/axs10x.h b/include/configs/axs10x.h index 58b1850d64..0707599a1c 100644 --- a/include/configs/axs10x.h +++ b/include/configs/axs10x.h @@ -82,12 +82,6 @@ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 64 /* - * SD/MMC configuration - */ -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - -/* * Ethernet PHY configuration */ #define CONFIG_MII diff --git a/include/configs/baltos.h b/include/configs/baltos.h index b6a6e68298..65c4470dc2 100644 --- a/include/configs/baltos.h +++ b/include/configs/baltos.h @@ -19,8 +19,7 @@ #include <linux/sizes.h> #include <configs/ti_am335x_common.h> -#define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */ -#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM +#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ @@ -32,12 +31,6 @@ /* Always 128 KiB env size */ #define CONFIG_ENV_SIZE (128 << 10) -/* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART - /* FIT support */ #define CONFIG_SYS_BOOTM_LEN SZ_64M @@ -309,8 +302,6 @@ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ -#undef CONFIG_PARTITION_UUIDS -#undef CONFIG_EFI_PARTITION /* * Disable CPSW SPL support so we fit within the 101KiB limit. */ diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index 2e8105afd4..aeb6507fc2 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -192,9 +192,6 @@ #define CONFIG_SUPPORT_VFAT /* Partitions */ -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION /*----------------------------------------------------------------------- * PCI stuff diff --git a/include/configs/bav335x.h b/include/configs/bav335x.h index 72e11d214c..e134f23ec9 100644 --- a/include/configs/bav335x.h +++ b/include/configs/bav335x.h @@ -29,8 +29,7 @@ #define CONFIG_SYS_BOOTM_LEN (16 << 20) -#define MACH_TYPE_TIAM335EVM 3589 /* Until the next sync */ -#define CONFIG_MACH_TYPE MACH_TYPE_TIAM335EVM +#define CONFIG_MACH_TYPE MACH_TYPE_AM335XEVM /* Clock Defines */ #define V_OSCK 24000000 /* Clock output from T2 */ @@ -42,10 +41,6 @@ /* Always 128 KiB env size */ #define CONFIG_ENV_SIZE (128 << 10) -/* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION - #ifdef CONFIG_NAND #define NANDARGS \ "mtdids=" MTDIDS_DEFAULT "\0" \ @@ -455,8 +450,6 @@ DEFAULT_LINUX_BOOT_ENV \ #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_USBETH_SUPPORT) /* disable host part of MUSB in SPL */ /* disable EFI partitions and partition UUID support */ -#undef CONFIG_PARTITION_UUIDS -#undef CONFIG_EFI_PARTITION #endif /* USB Device Firmware Update support */ diff --git a/include/configs/bayleybay.h b/include/configs/bayleybay.h index 60c513982e..3efdbd2d8b 100644 --- a/include/configs/bayleybay.h +++ b/include/configs/bayleybay.h @@ -23,8 +23,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT} -#define CONFIG_GENERIC_MMC - /* Environment configuration */ #define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_ENV_OFFSET 0x006ff000 diff --git a/include/configs/bcm23550_w1d.h b/include/configs/bcm23550_w1d.h index 8f062e260f..8368e151a5 100644 --- a/include/configs/bcm23550_w1d.h +++ b/include/configs/bcm23550_w1d.h @@ -31,8 +31,6 @@ #define CONFIG_KONA_GPIO /* MMC/SD Driver */ -#define CONFIG_GENERIC_MMC - #define CONFIG_SYS_SDIO_BASE0 SDIO1_BASE_ADDR #define CONFIG_SYS_SDIO_BASE1 SDIO2_BASE_ADDR #define CONFIG_SYS_SDIO_BASE2 SDIO3_BASE_ADDR @@ -105,8 +103,6 @@ * This is necessary for the fatls command to work on an SD card * for example. */ -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION /* version string, parser, etc */ #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/bcm28155_ap.h b/include/configs/bcm28155_ap.h index 0882531509..299674ad49 100644 --- a/include/configs/bcm28155_ap.h +++ b/include/configs/bcm28155_ap.h @@ -30,8 +30,6 @@ #define CONFIG_KONA_GPIO /* MMC/SD Driver */ -#define CONFIG_GENERIC_MMC - #define CONFIG_SYS_SDIO_BASE0 SDIO1_BASE_ADDR #define CONFIG_SYS_SDIO_BASE1 SDIO2_BASE_ADDR #define CONFIG_SYS_SDIO_BASE2 SDIO3_BASE_ADDR @@ -104,8 +102,6 @@ * This is necessary for the fatls command to work on an SD card * for example. */ -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION /* version string, parser, etc */ #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/bcm_ep_board.h b/include/configs/bcm_ep_board.h index b68fa1e443..a1e7a8cc83 100644 --- a/include/configs/bcm_ep_board.h +++ b/include/configs/bcm_ep_board.h @@ -60,13 +60,6 @@ #define CONFIG_SYS_MAXARGS 64 #define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE -/* - * One partition type must be defined for part.c - * This is necessary for the fatls command to work on an SD card - * for example. - */ -#define CONFIG_DOS_PARTITION - /* version string, parser, etc */ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING diff --git a/include/configs/beaver.h b/include/configs/beaver.h index 528ed6f6bb..cc32861169 100644 --- a/include/configs/beaver.h +++ b/include/configs/beaver.h @@ -21,15 +21,11 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE -#define MACH_TYPE_BEAVER 4597 /* not yet in mach-types.h */ #define CONFIG_MACH_TYPE MACH_TYPE_BEAVER /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) diff --git a/include/configs/bf518f-ezbrd.h b/include/configs/bf518f-ezbrd.h index 05b338ff12..e3c22869bc 100644 --- a/include/configs/bf518f-ezbrd.h +++ b/include/configs/bf518f-ezbrd.h @@ -128,7 +128,6 @@ * SDH Settings */ #if !defined(__ADSPBF512__) -#define CONFIG_GENERIC_MMC #define CONFIG_BFIN_SDH #endif diff --git a/include/configs/bf527-ad7160-eval.h b/include/configs/bf527-ad7160-eval.h index 40ca18d2b1..e433aaa91d 100644 --- a/include/configs/bf527-ad7160-eval.h +++ b/include/configs/bf527-ad7160-eval.h @@ -115,7 +115,6 @@ /* * SPI_MMC Settings */ -#define CONFIG_GENERIC_MMC #define CONFIG_MMC_SPI /* diff --git a/include/configs/bf533-stamp.h b/include/configs/bf533-stamp.h index afb3ef605d..516fe2d021 100644 --- a/include/configs/bf533-stamp.h +++ b/include/configs/bf533-stamp.h @@ -152,7 +152,6 @@ /* #define CONFIG_STAMP_CF */ #if defined(CONFIG_STAMP_CF) #define CONFIG_MISC_INIT_R -#define CONFIG_DOS_PARTITION 1 #undef CONFIG_IDE_8xx_DIRECT /* no pcmcia interface required */ #undef CONFIG_IDE_LED /* no led for ide supported */ #undef CONFIG_IDE_RESET /* no reset for ide supported */ diff --git a/include/configs/bf537-stamp.h b/include/configs/bf537-stamp.h index 651770524a..6858153720 100644 --- a/include/configs/bf537-stamp.h +++ b/include/configs/bf537-stamp.h @@ -124,9 +124,6 @@ * SPI_MMC Settings */ #define CONFIG_MMC_SPI -#ifdef CONFIG_MMC_SPI -#define CONFIG_GENERIC_MMC -#endif /* * NAND Settings @@ -184,7 +181,6 @@ #if defined(CONFIG_BFIN_IDE) -#define CONFIG_DOS_PARTITION 1 /* * IDE/ATA stuff */ diff --git a/include/configs/bf548-ezkit.h b/include/configs/bf548-ezkit.h index 81d5af6046..35cbebdfb8 100644 --- a/include/configs/bf548-ezkit.h +++ b/include/configs/bf548-ezkit.h @@ -142,7 +142,6 @@ * SDH Settings */ #if !defined(__ADSPBF544__) -#define CONFIG_GENERIC_MMC #define CONFIG_BFIN_SDH #endif diff --git a/include/configs/bf609-ezkit.h b/include/configs/bf609-ezkit.h index 55127c58a8..5791810b35 100644 --- a/include/configs/bf609-ezkit.h +++ b/include/configs/bf609-ezkit.h @@ -126,7 +126,6 @@ /* * SDH Settings */ -#define CONFIG_GENERIC_MMC #define CONFIG_BFIN_SDH /* diff --git a/include/configs/bfin_adi_common.h b/include/configs/bfin_adi_common.h index c401b731e8..72099bff97 100644 --- a/include/configs/bfin_adi_common.h +++ b/include/configs/bfin_adi_common.h @@ -21,10 +21,8 @@ # endif # ifdef CONFIG_LIBATA # define CONFIG_CMD_SATA -# define CONFIG_DOS_PARTITION # endif # ifdef CONFIG_MMC -# define CONFIG_DOS_PARTITION # define CONFIG_SYS_MMC_MAX_BLK_COUNT 127 # endif # ifdef CONFIG_MMC_SPI @@ -32,7 +30,6 @@ # endif # ifdef CONFIG_USB # define CONFIG_CMD_USB_STORAGE -# define CONFIG_DOS_PARTITION # endif # if defined(CONFIG_NAND_PLAT) || defined(CONFIG_DRIVER_NAND_BFIN) # define CONFIG_CMD_NAND diff --git a/include/configs/bg0900.h b/include/configs/bg0900.h index 57a698520b..fdb044d72d 100644 --- a/include/configs/bg0900.h +++ b/include/configs/bg0900.h @@ -11,7 +11,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS diff --git a/include/configs/blanche.h b/include/configs/blanche.h index 0deb350e3f..e040dbaede 100755 --- a/include/configs/blanche.h +++ b/include/configs/blanche.h @@ -95,8 +95,6 @@ /* USB */ #undef CONFIG_CMD_USB -#define CONFIG_GENERIC_MMC - /* Module stop status bits */ /* INTC-RT */ #define CONFIG_SMSTP0_ENA 0x00400000 diff --git a/include/configs/brppt1.h b/include/configs/brppt1.h index d619d23e0a..68e9efef1c 100644 --- a/include/configs/brppt1.h +++ b/include/configs/brppt1.h @@ -48,7 +48,6 @@ /* MMC/SD IP block */ #if defined(CONFIG_EMMC_BOOT) - #define CONFIG_GENERIC_MMC #define CONFIG_SUPPORT_EMMC_BOOT #endif /* CONFIG_EMMC_BOOT */ @@ -281,7 +280,6 @@ MMCARGS * enabled a number of useful commands and support. */ #if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE) -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_FS_EXT4 #define CONFIG_EXT4_WRITE diff --git a/include/configs/brxre1.h b/include/configs/brxre1.h index 98f8901d8f..02094b58af 100644 --- a/include/configs/brxre1.h +++ b/include/configs/brxre1.h @@ -43,7 +43,6 @@ /* GPIO */ /* MMC/SD IP block */ -#define CONFIG_GENERIC_MMC #define CONFIG_SUPPORT_EMMC_BOOT /* Always 64 KiB env size */ @@ -127,7 +126,6 @@ BUR_COMMON_ENV \ * enabled a number of useful commands and support. */ #if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE) -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #endif /* CONFIG_MMC, ... */ diff --git a/include/configs/calimain.h b/include/configs/calimain.h index dab4ec2aac..e990dedc9f 100644 --- a/include/configs/calimain.h +++ b/include/configs/calimain.h @@ -16,7 +16,6 @@ * Board */ #define CONFIG_DRIVER_TI_EMAC -#define MACH_TYPE_CALIMAIN 3528 #define CONFIG_MACH_TYPE MACH_TYPE_CALIMAIN /* diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index ca4d6ecaee..9babc3d62c 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -395,9 +395,6 @@ #endif /* Partitions */ -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION /*----------------------------------------------------------------------- * PCI stuff diff --git a/include/configs/cardhu.h b/include/configs/cardhu.h index 96d3a0d5cc..e338f9bdd2 100644 --- a/include/configs/cardhu.h +++ b/include/configs/cardhu.h @@ -25,12 +25,11 @@ #define CONFIG_TEGRA_ENABLE_UARTA #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE +#define CONFIG_MACH_TYPE MACH_TYPE_CARDHU + /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) diff --git a/include/configs/cei-tk1-som.h b/include/configs/cei-tk1-som.h index 9439863bfe..5ec63cd8be 100644 --- a/include/configs/cei-tk1-som.h +++ b/include/configs/cei-tk1-som.h @@ -29,9 +29,6 @@ /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) diff --git a/include/configs/chiliboard.h b/include/configs/chiliboard.h new file mode 100644 index 0000000000..04ee3a1d3c --- /dev/null +++ b/include/configs/chiliboard.h @@ -0,0 +1,214 @@ +/* + * Copyright (C) 2017 Grinn - http://grinn-global.com/ + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_CHILIBOARD_H +#define __CONFIG_CHILIBOARD_H + +#define CONFIG_NAND + +#include <configs/ti_am335x_common.h> + +#define CONFIG_CONS_INDEX 1 + +#ifndef CONFIG_SPL_BUILD +# define CONFIG_TIMESTAMP +# define CONFIG_LZO +#endif + +/* Clock Defines */ +#define V_OSCK 24000000 /* Clock output from T2 */ +#define V_SCLK (V_OSCK) + +#define NANDARGS \ + "mtdids=" MTDIDS_DEFAULT "\0" \ + "mtdparts=" MTDPARTS_DEFAULT "\0" \ + "nandargs=setenv bootargs console=${console} ${optargs} " \ + "${mtdparts} " \ + "root=${nandroot} " \ + "rootfstype=${nandrootfstype}\0" \ + "nandroot=ubi0:rootfs rw ubi.mtd=NAND.file-system\0" \ + "nandrootfstype=ubifs rootwait=1\0" \ + "nandboot=echo Booting from nand ...; " \ + "run nandargs; " \ + "nand read ${fdt_addr} NAND.u-boot-spl-os; " \ + "nand read ${loadaddr} NAND.kernel; " \ + "bootz ${loadaddr} - ${fdt_addr}\0" + +#define CONFIG_BOOTCOMMAND \ + "run mmcboot; " \ + "run nandboot; " \ + "run netboot" + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "loadaddr=0x82000000\0" \ + "fdt_addr=0x87800000\0" \ + "boot_fdt=try\0" \ + "console=ttyO0,115200n8\0" \ + "image=zImage\0" \ + "fdt_file=am335x-chiliboard.dtb\0" \ + "ip_dyn=yes\0" \ + "optargs=\0" \ + "loadbootscript=" \ + "load mmc ${mmcdev}:${mmcpart} ${loadaddr} ${script};\0" \ + "bootscript=echo Running bootscript from mmc ...; " \ + "source\0" \ + "loadimage=load mmc ${mmcdev}:${mmcpart} ${loadaddr} " \ + "${boot_dir}/${image}\0" \ + "loadfdt=load mmc ${mmcdev}:${mmcpart} ${fdt_addr} " \ + "${boot_dir}/${fdt_file}\0" \ + "mmcdev=0\0" \ + "mmcpart=1\0" \ + "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ + "mmcargs=setenv bootargs console=${console},${baudrate} ${optargs} " \ + "${mtdparts} " \ + "root=${mmcroot}\0" \ + "mmcloados=run mmcargs; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ + "if run loadfdt; then " \ + "bootz ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ + "bootz; " \ + "else " \ + "echo WARN: Cannot load the DT; " \ + "fi; " \ + "fi; " \ + "else " \ + "bootz; " \ + "fi;\0" \ + "mmcboot=mmc dev ${mmcdev}; " \ + "if mmc rescan; then " \ + "echo SD/MMC found on device ${mmcdev};" \ + "if run loadimage; then " \ + "run mmcloados;" \ + "fi;" \ + "fi;\0" \ + "netargs=setenv bootargs console=${console},${baudrate} ${optargs} " \ + "${mtdparts} " \ + "root=/dev/nfs " \ + "ip=dhcp nfsroot=${serverip}:${nfsroot},v3,tcp\0" \ + "netboot=echo Booting from net ...; " \ + "run netargs; " \ + "if test ${ip_dyn} = yes; then " \ + "setenv get_cmd dhcp; " \ + "else " \ + "setenv get_cmd tftp; " \ + "fi; " \ + "${get_cmd} ${image}; " \ + "if test ${boot_fdt} = yes || test ${boot_fdt} = try; then " \ + "if ${get_cmd} ${fdt_addr} ${fdt_file}; then " \ + "bootz ${loadaddr} - ${fdt_addr}; " \ + "else " \ + "if test ${boot_fdt} = try; then " \ + "bootz; " \ + "else " \ + "echo WARN: Cannot load the DT; " \ + "fi; " \ + "fi; " \ + "else " \ + "bootz; " \ + "fi;\0" \ + NANDARGS + +/* NS16550 Configuration */ +#define CONFIG_SYS_NS16550_COM1 0x44e09000 /* UART0 */ +#define CONFIG_SYS_NS16550_COM2 0x48022000 /* UART1 */ +#define CONFIG_SYS_NS16550_COM3 0x48024000 /* UART2 */ +#define CONFIG_SYS_NS16550_COM4 0x481a6000 /* UART3 */ +#define CONFIG_SYS_NS16550_COM5 0x481a8000 /* UART4 */ +#define CONFIG_SYS_NS16550_COM6 0x481aa000 /* UART5 */ +#define CONFIG_BAUDRATE 115200 + +/* PMIC support */ +#define CONFIG_POWER_TPS65217 + +/* SPL */ +/* Bootcount using the RTC block */ +#define CONFIG_BOOTCOUNT_LIMIT +#define CONFIG_BOOTCOUNT_AM33XX +#define CONFIG_SYS_BOOTCOUNT_BE + +#define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/am33xx/u-boot-spl.lds" + +/* NAND: device related configs */ +#define CONFIG_SYS_NAND_5_ADDR_CYCLE +#define CONFIG_SYS_NAND_PAGE_COUNT (CONFIG_SYS_NAND_BLOCK_SIZE / \ + CONFIG_SYS_NAND_PAGE_SIZE) +#define CONFIG_SYS_NAND_PAGE_SIZE 2048 +#define CONFIG_SYS_NAND_OOBSIZE 64 +#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024) +/* NAND: driver related configs */ +#define CONFIG_NAND_OMAP_GPMC +#define CONFIG_NAND_OMAP_GPMC_PREFETCH +#define CONFIG_NAND_OMAP_ELM +#define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS +#define CONFIG_SYS_NAND_ECCPOS { 2, 3, 4, 5, 6, 7, 8, 9, \ + 10, 11, 12, 13, 14, 15, 16, 17, \ + 18, 19, 20, 21, 22, 23, 24, 25, \ + 26, 27, 28, 29, 30, 31, 32, 33, \ + 34, 35, 36, 37, 38, 39, 40, 41, \ + 42, 43, 44, 45, 46, 47, 48, 49, \ + 50, 51, 52, 53, 54, 55, 56, 57, } + +#define CONFIG_SYS_NAND_ECCSIZE 512 +#define CONFIG_SYS_NAND_ECCBYTES 14 +#define CONFIG_SYS_NAND_ONFI_DETECTION +#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW +#define MTDIDS_DEFAULT "nand0=8000000.nand" +#define MTDPARTS_DEFAULT "mtdparts=8000000.nand:" \ + "128k(NAND.SPL)," \ + "128k(NAND.SPL.backup1)," \ + "128k(NAND.SPL.backup2)," \ + "128k(NAND.SPL.backup3)," \ + "256k(NAND.u-boot-spl-os)," \ + "1m(NAND.u-boot)," \ + "128k(NAND.u-boot-env)," \ + "128k(NAND.u-boot-env.backup1)," \ + "8m(NAND.kernel)," \ + "-(NAND.file-system)" +#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x000c0000 +/* NAND: SPL related configs */ +#ifdef CONFIG_SPL_NAND_SUPPORT +#define CONFIG_SPL_NAND_AM33XX_BCH +#endif + +/* USB configuration */ +#define CONFIG_USB_MUSB_DSPS +#define CONFIG_ARCH_MISC_INIT +#define CONFIG_USB_MUSB_PIO_ONLY +#define CONFIG_USB_MUSB_DISABLE_BULK_COMBINE_SPLIT +#define CONFIG_AM335X_USB1 +#define CONFIG_AM335X_USB1_MODE MUSB_HOST + +/* + * Disable MMC DM for SPL build and can be re-enabled after adding + * DM support in SPL + */ +#ifdef CONFIG_SPL_BUILD +#undef CONFIG_DM_MMC +#undef CONFIG_TIMER +#undef CONFIG_DM_USB +#endif + +#if defined(CONFIG_ENV_IS_IN_NAND) +#define CONFIG_ENV_OFFSET 0x001c0000 +#define CONFIG_ENV_OFFSET_REDUND 0x001e0000 +#define CONFIG_ENV_SIZE SZ_128K +#define CONFIG_SYS_ENV_SECT_SIZE CONFIG_SYS_NAND_BLOCK_SIZE +#else +#define CONFIG_ENV_IS_IN_MMC +#define CONFIG_SYS_MMC_ENV_DEV 0 +#define CONFIG_ENV_OFFSET SZ_128K +#define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) +#define CONFIG_ENV_SIZE SZ_8K +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT +#endif + +/* Network. */ +#define CONFIG_PHYLIB +#define CONFIG_PHY_SMSC + +#endif /* ! __CONFIG_CHILIBOARD_H */ diff --git a/include/configs/cl-som-am57x.h b/include/configs/cl-som-am57x.h index 9111cbda33..e1f724bf2e 100644 --- a/include/configs/cl-som-am57x.h +++ b/include/configs/cl-som-am57x.h @@ -85,10 +85,6 @@ #define CONFIG_SYS_I2C_PCA953X_ADDR 0x20 #define CONFIG_SYS_I2C_PCA953X_WIDTH { {0x20, 16} } -/* GPT */ -#define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION - /* USB xHCI HOST */ #define CONFIG_USB_XHCI_OMAP #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 diff --git a/include/configs/clearfog.h b/include/configs/clearfog.h index e520b1a735..a544223f7e 100644 --- a/include/configs/clearfog.h +++ b/include/configs/clearfog.h @@ -43,12 +43,9 @@ /* * SDIO/MMC Card Configuration */ -#define CONFIG_GENERIC_MMC #define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE /* Partition support */ -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION /* Additional FS support/configuration */ #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/cm-bf537e.h b/include/configs/cm-bf537e.h index 32229d2182..cc31a30dbb 100644 --- a/include/configs/cm-bf537e.h +++ b/include/configs/cm-bf537e.h @@ -118,7 +118,6 @@ /* * SPI_MMC Settings */ -#define CONFIG_GENERIC_MMC #define CONFIG_MMC_SPI /* diff --git a/include/configs/cm-bf537u.h b/include/configs/cm-bf537u.h index dc2eabd3e5..282eb4f0b2 100644 --- a/include/configs/cm-bf537u.h +++ b/include/configs/cm-bf537u.h @@ -116,7 +116,6 @@ /* * SPI_MMC Settings */ -#define CONFIG_GENERIC_MMC #define CONFIG_MMC_SPI /* diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index b65ca3e290..b3a98dfa63 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -225,9 +225,6 @@ #define CONFIG_USB_CLOCK 0x0001BBBB #define CONFIG_USB_CONFIG 0x00001000 /* Partitions (for USB) */ -#define CONFIG_MAC_PARTITION 1 -#define CONFIG_DOS_PARTITION 1 -#define CONFIG_ISO_PARTITION 1 /* * Invoke our last_stage_init function - needed by fwupdate diff --git a/include/configs/cm_t335.h b/include/configs/cm_t335.h index 8d5f26a139..2898f47e83 100644 --- a/include/configs/cm_t335.h +++ b/include/configs/cm_t335.h @@ -24,7 +24,6 @@ #undef CONFIG_MAX_RAM_BANK_SIZE #define CONFIG_MAX_RAM_BANK_SIZE (512 << 20) /* 512MB */ -#define MACH_TYPE_CM_T335 4586 /* Until the next sync */ #define CONFIG_MACH_TYPE MACH_TYPE_CM_T335 /* Clock Defines */ diff --git a/include/configs/cm_t35.h b/include/configs/cm_t35.h index ab695cba32..017a8bd47f 100644 --- a/include/configs/cm_t35.h +++ b/include/configs/cm_t35.h @@ -80,9 +80,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - /* USB */ #define CONFIG_USB_OMAP3 #define CONFIG_USB_EHCI diff --git a/include/configs/cm_t3517.h b/include/configs/cm_t3517.h index 6ee61d5a86..da866e4fba 100644 --- a/include/configs/cm_t3517.h +++ b/include/configs/cm_t3517.h @@ -87,9 +87,6 @@ #define CONFIG_OMAP_GPIO -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - /* USB */ #define CONFIG_USB_MUSB_AM35X diff --git a/include/configs/cm_t43.h b/include/configs/cm_t43.h index 9c24ba9965..4f44a6752e 100644 --- a/include/configs/cm_t43.h +++ b/include/configs/cm_t43.h @@ -105,10 +105,6 @@ #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-omap2/u-boot-spl.lds" -/* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION - #define CONFIG_EXTRA_ENV_SETTINGS \ "loadaddr=0x80200000\0" \ "fdtaddr=0x81200000\0" \ diff --git a/include/configs/colibri_imx6.h b/include/configs/colibri_imx6.h index ca94fab4c0..c4765ebc77 100644 --- a/include/configs/colibri_imx6.h +++ b/include/configs/colibri_imx6.h @@ -65,10 +65,8 @@ #define CONFIG_SYS_FSL_USDHC_NUM 2 #define CONFIG_SUPPORT_EMMC_BOOT /* eMMC specific */ -#define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_FAT_WRITE -#define CONFIG_DOS_PARTITION /* Network */ #define CONFIG_FEC_MXC diff --git a/include/configs/colibri_t20.h b/include/configs/colibri_t20.h index 791a29b4d2..8b854c37a1 100644 --- a/include/configs/colibri_t20.h +++ b/include/configs/colibri_t20.h @@ -19,12 +19,11 @@ #define CONFIG_TEGRA_UARTA_SDIO1 #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE +#define CONFIG_MACH_TYPE MACH_TYPE_COLIBRI_TEGRA2 + /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC support */ -#define CONFIG_GENERIC_MMC - /* USB host support */ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_TEGRA diff --git a/include/configs/colibri_t30.h b/include/configs/colibri_t30.h index 5b66429b8e..bc1904418d 100644 --- a/include/configs/colibri_t30.h +++ b/include/configs/colibri_t30.h @@ -25,9 +25,6 @@ /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC support */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, before config block at the end of 1st "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE + \ diff --git a/include/configs/colibri_vf.h b/include/configs/colibri_vf.h index 9cca4b9d82..e0feb0a152 100644 --- a/include/configs/colibri_vf.h +++ b/include/configs/colibri_vf.h @@ -57,9 +57,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - #define CONFIG_RBTREE #define CONFIG_LZO #define CONFIG_CMD_UBIFS /* increases size by almost 60 KB */ diff --git a/include/configs/conga-qeval20-qa3-e3845.h b/include/configs/conga-qeval20-qa3-e3845.h index d21c95abb5..a70845e101 100644 --- a/include/configs/conga-qeval20-qa3-e3845.h +++ b/include/configs/conga-qeval20-qa3-e3845.h @@ -23,8 +23,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT} -#define CONFIG_GENERIC_MMC - #undef CONFIG_USB_MAX_CONTROLLER_COUNT #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 diff --git a/include/configs/controlcenterd.h b/include/configs/controlcenterd.h index 7c6fd741d3..cc2b2736f4 100644 --- a/include/configs/controlcenterd.h +++ b/include/configs/controlcenterd.h @@ -205,8 +205,6 @@ /* * MMC */ -#define CONFIG_GENERIC_MMC - #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR @@ -373,7 +371,6 @@ #define CONFIG_HW_WATCHDOG #define CONFIG_LOADS_ECHO #define CONFIG_SYS_LOADS_BAUD_CHANGE -#define CONFIG_DOS_PARTITION /* * For booting Linux, the board info and command line data diff --git a/include/configs/corenet_ds.h b/include/configs/corenet_ds.h index 3ca30cbb71..dd38fa3511 100644 --- a/include/configs/corenet_ds.h +++ b/include/configs/corenet_ds.h @@ -548,7 +548,6 @@ #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* CONFIG_PCI */ /* SATA */ @@ -566,7 +565,6 @@ #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif #ifdef CONFIG_FMAN_ENET @@ -621,8 +619,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* Hash command with SHA acceleration supported in hardware */ diff --git a/include/configs/corvus.h b/include/configs/corvus.h index ec7e3029f6..e78f5110ec 100644 --- a/include/configs/corvus.h +++ b/include/configs/corvus.h @@ -102,7 +102,6 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 -#define CONFIG_DOS_PARTITION /* USB DFU support */ #define CONFIG_CMD_MTDPARTS diff --git a/include/configs/crownbay.h b/include/configs/crownbay.h index 219944ae19..5ec09ba5c4 100644 --- a/include/configs/crownbay.h +++ b/include/configs/crownbay.h @@ -24,8 +24,6 @@ #define CONFIG_SCSI_DEV_LIST \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_TCF_SATA} -#define CONFIG_GENERIC_MMC - /* Environment configuration */ #define CONFIG_ENV_SECT_SIZE 0x1000 #define CONFIG_ENV_OFFSET 0 diff --git a/include/configs/cyrus.h b/include/configs/cyrus.h index e98682c120..3f195ab413 100644 --- a/include/configs/cyrus.h +++ b/include/configs/cyrus.h @@ -379,7 +379,6 @@ #define CONFIG_NET_MULTI #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* CONFIG_PCI */ /* SATA */ @@ -397,7 +396,6 @@ #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif #ifdef CONFIG_FMAN_ENET @@ -443,8 +441,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR #define CONFIG_SYS_FSL_ESDHC_BROKEN_TIMEOUT -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* diff --git a/include/configs/da850evm.h b/include/configs/da850evm.h index e1f9b90171..ecefa979f5 100644 --- a/include/configs/da850evm.h +++ b/include/configs/da850evm.h @@ -310,19 +310,6 @@ #undef CONFIG_CMD_ENV #endif -/* SD/MMC configuration */ -#ifndef CONFIG_USE_NOR -#define CONFIG_GENERIC_MMC -#endif - -/* - * Enable MMC commands only when - * MMC support is present - */ -#ifdef CONFIG_MMC -#define CONFIG_DOS_PARTITION -#endif - #ifndef CONFIG_DIRECT_NOR_BOOT /* defines for SPL */ #define CONFIG_SPL_FRAMEWORK diff --git a/include/configs/dalmore.h b/include/configs/dalmore.h index a0f04f9ce3..f3ff9e7494 100644 --- a/include/configs/dalmore.h +++ b/include/configs/dalmore.h @@ -23,17 +23,12 @@ /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 #define CONFIG_SYS_MMC_ENV_PART 2 #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) -#define MACH_TYPE_DALMORE 4304 /* not yet in mach-types.h */ - /* SPI */ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_0 #define CONFIG_SF_DEFAULT_SPEED 24000000 diff --git a/include/configs/db-88f6820-amc.h b/include/configs/db-88f6820-amc.h index 483482844c..6d057762e3 100644 --- a/include/configs/db-88f6820-amc.h +++ b/include/configs/db-88f6820-amc.h @@ -41,8 +41,6 @@ #define CONFIG_SF_DEFAULT_MODE SPI_MODE_3 /* Partition support */ -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION /* Additional FS support/configuration */ #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/db-88f6820-gp.h b/include/configs/db-88f6820-gp.h index 519f2d3de0..1fdeeddc5b 100644 --- a/include/configs/db-88f6820-gp.h +++ b/include/configs/db-88f6820-gp.h @@ -43,7 +43,6 @@ /* * SDIO/MMC Card Configuration */ -#define CONFIG_GENERIC_MMC #define CONFIG_SYS_MMC_BASE MVEBU_SDIO_BASE /* @@ -58,8 +57,6 @@ CONFIG_SYS_SCSI_MAX_LUN) /* Partition support */ -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION /* Additional FS support/configuration */ #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/db-mv784mp-gp.h b/include/configs/db-mv784mp-gp.h index 26508c2eac..656c8c3a01 100644 --- a/include/configs/db-mv784mp-gp.h +++ b/include/configs/db-mv784mp-gp.h @@ -62,8 +62,6 @@ #define CONFIG_SATA_MV #define CONFIG_LIBATA #define CONFIG_LBA48 -#define CONFIG_EFI_PARTITION -#define CONFIG_DOS_PARTITION /* Additional FS support/configuration */ #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/dbau1x00.h b/include/configs/dbau1x00.h index 182e8abedd..ad7667eb23 100644 --- a/include/configs/dbau1x00.h +++ b/include/configs/dbau1x00.h @@ -173,7 +173,6 @@ #define CONFIG_PCMCIA_SLOT_A #define CONFIG_ATAPI 1 -#define CONFIG_MAC_PARTITION 1 /* We run CF in "true ide" mode or a harddrive via pcmcia */ #define CONFIG_IDE_PCMCIA 1 diff --git a/include/configs/devkit3250.h b/include/configs/devkit3250.h index c04146ffcd..9c7afa5005 100644 --- a/include/configs/devkit3250.h +++ b/include/configs/devkit3250.h @@ -13,10 +13,6 @@ #include <linux/sizes.h> #include <asm/arch/cpu.h> -/* - * Define DevKit3250 machine type by hand until it lands in mach-types - */ -#define MACH_TYPE_DEVKIT3250 3697 #define CONFIG_MACH_TYPE MACH_TYPE_DEVKIT3250 #define CONFIG_SYS_ICACHE_OFF @@ -136,7 +132,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING -#define CONFIG_DOS_PARTITION /* * Pass open firmware flat tree diff --git a/include/configs/dfi-bt700.h b/include/configs/dfi-bt700.h index 211c9ea130..edb495842b 100644 --- a/include/configs/dfi-bt700.h +++ b/include/configs/dfi-bt700.h @@ -28,8 +28,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT} -#define CONFIG_GENERIC_MMC - #undef CONFIG_USB_MAX_CONTROLLER_COUNT #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 diff --git a/include/configs/digsy_mtc.h b/include/configs/digsy_mtc.h index ae0d3d412a..d6803c5422 100644 --- a/include/configs/digsy_mtc.h +++ b/include/configs/digsy_mtc.h @@ -61,10 +61,6 @@ #define CONFIG_PCI_IO_PHYS CONFIG_PCI_IO_BUS #define CONFIG_PCI_IO_SIZE 0x01000000 -/* - * Partitions - */ -#define CONFIG_DOS_PARTITION #define CONFIG_BZIP2 /* diff --git a/include/configs/dns325.h b/include/configs/dns325.h index 1b61afd324..1f06e5832f 100644 --- a/include/configs/dns325.h +++ b/include/configs/dns325.h @@ -16,7 +16,6 @@ /* * Machine number definition */ -#define MACH_TYPE_DNS325 3800 #define CONFIG_MACH_TYPE MACH_TYPE_DNS325 /* diff --git a/include/configs/dra7xx_evm.h b/include/configs/dra7xx_evm.h index da458a47b4..bf8c041fb7 100644 --- a/include/configs/dra7xx_evm.h +++ b/include/configs/dra7xx_evm.h @@ -100,8 +100,6 @@ #include <configs/ti_omap5_common.h> /* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION #define CONFIG_RANDOM_UUID #define CONFIG_HSMMC2_8BIT diff --git a/include/configs/draco.h b/include/configs/draco.h index b4ca982e18..da77c451b0 100644 --- a/include/configs/draco.h +++ b/include/configs/draco.h @@ -14,7 +14,6 @@ #define __CONFIG_DRACO_H #define CONFIG_SIEMENS_DRACO -#define MACH_TYPE_DRACO 4314 #define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_DRACO #include "siemens-am33x-common.h" @@ -31,8 +30,6 @@ "led0=103,1,0\0" \ "led1=64,0,1\0" -#undef CONFIG_DOS_PARTITION - /* Physical Memory Map */ #define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ diff --git a/include/configs/dragonboard410c.h b/include/configs/dragonboard410c.h index e6bb9190c2..da1c58983a 100644 --- a/include/configs/dragonboard410c.h +++ b/include/configs/dragonboard410c.h @@ -31,9 +31,6 @@ /* Generic Timer Definitions */ #define COUNTER_FREQUENCY 19000000 -/* This are needed to have proper mmc support */ -#define CONFIG_GENERIC_MMC - #define CONFIG_SYS_LDSCRIPT "board/qualcomm/dragonboard410c/u-boot.lds" /* Fixup - in init code we switch from device to host mode, @@ -54,19 +51,16 @@ /* Extra Commands */ #define CONFIG_CMD_ENV -#define CONFIG_CMD_GPT #define CONFIG_CMD_MD5SUM /* Enable that for switching of boot partitions */ /* Disabled by default as some sub-commands can brick eMMC */ /*#define CONFIG_SUPPORT_EMMC_BOOT */ -#define CONFIG_CMD_PART #define CONFIG_CMD_REGINFO /* Register dump */ #define CONFIG_CMD_TFTP #define CONFIG_CMD_UNZIP /* Partition table support */ #define HAVE_BLOCK_DEVICE /* Needed for partition commands */ -#define CONFIG_PARTITION_UUIDS #include <config_distro_defaults.h> diff --git a/include/configs/dreamplug.h b/include/configs/dreamplug.h index 252e5f5d1e..003cf0e1f3 100644 --- a/include/configs/dreamplug.h +++ b/include/configs/dreamplug.h @@ -13,19 +13,6 @@ #define _CONFIG_DREAMPLUG_H /* - * FIXME: This belongs in mach-types.h. However, we only pull mach-types - * from Linus' kernel.org tree. This hasn't been updated primarily due to - * the recent arch/arm reshuffling. So, in the meantime, we'll place it - * here. - */ -#include <asm/mach-types.h> -#ifdef MACH_TYPE_DREAMPLUG -#error "MACH_TYPE_DREAMPLUG has been defined properly, please remove this." -#else -#define MACH_TYPE_DREAMPLUG 3550 -#endif - -/* * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ diff --git a/include/configs/ds109.h b/include/configs/ds109.h index 222a510034..4c874367fd 100644 --- a/include/configs/ds109.h +++ b/include/configs/ds109.h @@ -12,24 +12,13 @@ #ifndef _CONFIG_DS109_H #define _CONFIG_DS109_H -/* - * FIXME: This belongs in mach-types.h. However, we only pull mach-types - * from Linus' kernel.org tree. This hasn't been updated primarily due to - * the recent arch/arm reshuffling. So, in the meantime, we'll place it - * here. - */ -#include <asm/mach-types.h> -#ifdef MACH_TYPE_SYNOLOGY -#error "MACH_TYPE_SYNOLOGY has been defined properly, please remove this." -#else -#define MACH_TYPE_SYNOLOGY 527 -#endif +/* Provide the MACH_TYPE value that the vendor kernel requires. */ +#define CONFIG_MACH_TYPE 527 /* * High Level Configuration Options (easy to change) */ #define CONFIG_SHEEVA_88SV131 1 /* CPU Core subversion */ -#define CONFIG_MACH_TYPE MACH_TYPE_SYNOLOGY /* * Commands configuration diff --git a/include/configs/ds414.h b/include/configs/ds414.h index 0be8800c99..9d5a5f74f3 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -81,8 +81,6 @@ #endif /* why is this only defined in mv-common.h if CONFIG_DM is undefined? */ -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION #define CONFIG_SUPPORT_VFAT #define CONFIG_SYS_MVFS diff --git a/include/configs/duovero.h b/include/configs/duovero.h index b5bd3ba651..4bb81e5d9c 100644 --- a/include/configs/duovero.h +++ b/include/configs/duovero.h @@ -16,13 +16,10 @@ * High Level Configuration Options */ #define CONFIG_DUOVERO -#define MACH_TYPE_OMAP4_DUOVERO 4097 /* Until the next sync */ -#define CONFIG_MACH_TYPE MACH_TYPE_OMAP4_DUOVERO +#define CONFIG_MACH_TYPE MACH_TYPE_DUOVERO #include <configs/ti_omap4_common.h> -#undef CONFIG_EFI_PARTITION - #undef CONFIG_SYS_EMIF_PRECALCULATED_TIMING_REGS #define CONFIG_SYS_AUTOMATIC_SDRAM_DETECTION #define CONFIG_SYS_DEFAULT_LPDDR2_TIMINGS diff --git a/include/configs/e2220-1170.h b/include/configs/e2220-1170.h index 064906d6d3..b6a758f0b2 100644 --- a/include/configs/e2220-1170.h +++ b/include/configs/e2220-1170.h @@ -21,9 +21,6 @@ /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/eco5pk.h b/include/configs/eco5pk.h index c7b0a389c9..03cc74c596 100644 --- a/include/configs/eco5pk.h +++ b/include/configs/eco5pk.h @@ -28,7 +28,6 @@ #define CONFIG_SYS_NS16550_COM3 OMAP34XX_UART3 #define CONFIG_SERIAL3 -#define MACH_TYPE_ECO5_PK 4017 #define CONFIG_MACH_TYPE MACH_TYPE_ECO5_PK #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/ecovec.h b/include/configs/ecovec.h index 867e6716ab..591028eec2 100644 --- a/include/configs/ecovec.h +++ b/include/configs/ecovec.h @@ -31,8 +31,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_ENV -#define CONFIG_DOS_PARTITION - #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC0,115200" diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index 1f43dc0ba4..175adbddc6 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -145,7 +145,6 @@ #ifdef CONFIG_CMD_IDE #define __io #define CONFIG_IDE_PREINIT -#define CONFIG_DOS_PARTITION /* ED Mini V has an IDE-compatible SATA connector for port 1 */ #define CONFIG_MVSATA_IDE #define CONFIG_MVSATA_IDE_USE_PORT1 @@ -176,8 +175,6 @@ #define CONFIG_USB_EHCI /* Enable EHCI USB support */ #define CONFIG_USB_EHCI_MARVELL #define ORION5X_USB20_HOST_PORT_BASE ORION5X_USB20_PORT0_BASE -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION #define CONFIG_SUPPORT_VFAT #endif /* CONFIG_CMD_USB */ diff --git a/include/configs/etamin.h b/include/configs/etamin.h index 8a10888812..3383f06bf7 100644 --- a/include/configs/etamin.h +++ b/include/configs/etamin.h @@ -88,7 +88,6 @@ "led4=60,0,1\0" \ "led5=63,0,1\0" -#undef CONFIG_DOS_PARTITION #undef CONFIG_CMD_FAT /* Physical Memory Map */ diff --git a/include/configs/ethernut5.h b/include/configs/ethernut5.h index c78eebfdef..a3c40d68aa 100644 --- a/include/configs/ethernut5.h +++ b/include/configs/ethernut5.h @@ -19,7 +19,6 @@ #define CONFIG_SKIP_LOWLEVEL_INIT /* Set our official architecture number. */ -#define MACH_TYPE_ETHERNUT5 1971 #define CONFIG_MACH_TYPE MACH_TYPE_ETHERNUT5 /* CPU information */ @@ -127,7 +126,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #define CONFIG_SYS_MMC_CD_PIN AT91_PIO_PORTC, 8 #endif @@ -193,10 +191,6 @@ #define MTDIDS_DEFAULT "nand0=atmel_nand" #define MTDPARTS_DEFAULT "mtdparts=atmel_nand:-(root)" #endif -#if defined(CONFIG_CMD_REISER) || defined(CONFIG_CMD_EXT2) || \ - defined(CONFIG_CMD_USB) || defined(CONFIG_MMC) -#define CONFIG_DOS_PARTITION -#endif #define CONFIG_LZO #define CONFIG_RBTREE diff --git a/include/configs/evb_ast2500.h b/include/configs/evb_ast2500.h new file mode 100644 index 0000000000..a571f2a749 --- /dev/null +++ b/include/configs/evb_ast2500.h @@ -0,0 +1,27 @@ +/* + * Copyright (C) 2012-2020 ASPEED Technology Inc. + * Ryan Chen <ryan_chen@aspeedtech.com> + * + * Copyright 2016 Google Inc + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <configs/aspeed-common.h> + +#define CONFIG_SYS_MEMTEST_START (CONFIG_SYS_SDRAM_BASE + 0x300000) +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 0x5000000) + +#define CONFIG_SYS_UBOOT_BASE CONFIG_SYS_TEXT_BASE + +/* Memory Info */ +#define CONFIG_SYS_LOAD_ADDR 0x83000000 + +#define CONFIG_ENV_IS_NOWHERE + +#define CONFIG_ENV_SIZE 0x20000 + +#endif /* __CONFIG_H */ diff --git a/include/configs/exynos-common.h b/include/configs/exynos-common.h index 978495527d..6f57b21b30 100644 --- a/include/configs/exynos-common.h +++ b/include/configs/exynos-common.h @@ -37,7 +37,6 @@ #define CONFIG_BAUDRATE 115200 /* SD/MMC configuration */ -#define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER /* PWM */ @@ -46,9 +45,6 @@ /* Command definition*/ #define CONFIG_FAT_WRITE -#define CONFIG_CMD_PART -#define CONFIG_PARTITION_UUIDS - /* Miscellaneous configurable options */ #define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */ #define CONFIG_SYS_PBSIZE 1024 /* Print Buffer Size */ diff --git a/include/configs/exynos4-common.h b/include/configs/exynos4-common.h index ec45640698..787c6de3ae 100644 --- a/include/configs/exynos4-common.h +++ b/include/configs/exynos4-common.h @@ -22,7 +22,6 @@ #undef CONFIG_CMD_ONENAND #undef CONFIG_CMD_MTDPARTS -#define CONFIG_CMD_GPT /* TIZEN THOR downloader support */ #define CONFIG_CMD_THOR_DOWNLOAD diff --git a/include/configs/exynos5250-common.h b/include/configs/exynos5250-common.h index 846739a6c5..aee9fea9da 100644 --- a/include/configs/exynos5250-common.h +++ b/include/configs/exynos5250-common.h @@ -15,8 +15,6 @@ #define CONFIG_SYS_SDRAM_BASE 0x40000000 #define CONFIG_SYS_TEXT_BASE 0x43E00000 -/* MACH_TYPE_SMDK5250 macro will be removed once added to mach-types */ -#define MACH_TYPE_SMDK5250 3774 #define CONFIG_MACH_TYPE MACH_TYPE_SMDK5250 #define CONFIG_SPL_MAX_FOOTPRINT (14 * 1024) diff --git a/include/configs/exynos5420-common.h b/include/configs/exynos5420-common.h index 16153eb595..79e6d13491 100644 --- a/include/configs/exynos5420-common.h +++ b/include/configs/exynos5420-common.h @@ -15,8 +15,8 @@ #define CONFIG_EXYNOS5_DT -#define MACH_TYPE_SMDK5420 8002 -#define CONFIG_MACH_TYPE MACH_TYPE_SMDK5420 +/* Provide the MACH_TYPE value that the vendor kernel requires. */ +#define CONFIG_MACH_TYPE 8002 #define CONFIG_VAR_SIZE_SPL diff --git a/include/configs/flea3.h b/include/configs/flea3.h index 96a2a80aca..fa2fcb1ec7 100644 --- a/include/configs/flea3.h +++ b/include/configs/flea3.h @@ -20,11 +20,6 @@ #define CONFIG_SYS_DCACHE_OFF -/* Only in case the value is not present in mach-types.h */ -#ifndef MACH_TYPE_FLEA3 -#define MACH_TYPE_FLEA3 3668 -#endif - #define CONFIG_MACH_TYPE MACH_TYPE_FLEA3 /* Set TEXT at the beginning of the NOR flash */ diff --git a/include/configs/galileo.h b/include/configs/galileo.h index 986001e9b7..dcbaade54e 100644 --- a/include/configs/galileo.h +++ b/include/configs/galileo.h @@ -26,9 +26,6 @@ #undef CONFIG_SCSI_AHCI #undef CONFIG_SCSI -/* SD/MMC support */ -#define CONFIG_GENERIC_MMC - /* 10/100M Ethernet support */ #define CONFIG_DESIGNWARE_ETH #define CONFIG_DW_ALTDESCRIPTOR diff --git a/include/configs/ge_bx50v3.h b/include/configs/ge_bx50v3.h index 91712c178d..a2adbeba74 100644 --- a/include/configs/ge_bx50v3.h +++ b/include/configs/ge_bx50v3.h @@ -64,9 +64,7 @@ #define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 -#define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_DOS_PARTITION /* USB Configs */ #ifdef CONFIG_USB diff --git a/include/configs/gose.h b/include/configs/gose.h index 45395cdda6..15b3227a77 100644 --- a/include/configs/gose.h +++ b/include/configs/gose.h @@ -94,7 +94,6 @@ #define CONFIG_SMSTP7_ENA 0x00200000 /* SDHI */ -#define CONFIG_GENERIC_MMC #define CONFIG_SH_SDHI_FREQ 97500000 #endif /* __GOSE_H */ diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index 612e8501ed..5639a45b37 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -16,22 +16,12 @@ #define __CONFIG_GPLUGD_H /* - * FIXME: fix for error caused due to recent update to mach-types.h - */ -#include <asm/mach-types.h> -#ifdef MACH_TYPE_SHEEVAD -#error "MACH_TYPE_SHEEVAD has been defined properly, please remove this." -#else -#define MACH_TYPE_SHEEVAD 2625 -#endif - -/* * High Level Configuration Options */ #define CONFIG_SHEEVA_88SV331xV5 1 /* CPU Core subversion */ #define CONFIG_ARMADA100 1 /* SOC Family Name */ #define CONFIG_ARMADA168 1 /* SOC Used on this Board */ -#define CONFIG_MACH_TYPE MACH_TYPE_SHEEVAD /* Machine type */ +#define CONFIG_MACH_TYPE MACH_TYPE_GPLUGD /* Machine type */ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ #define CONFIG_SYS_TEXT_BASE 0x00f00000 @@ -98,8 +88,6 @@ #define CONFIG_EHCI_IS_TDI #endif /* CONFIG_CMD_USB */ -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION #define CONFIG_SUPPORT_VFAT #endif /* __CONFIG_GPLUGD_H */ diff --git a/include/configs/gr_cpci_ax2000.h b/include/configs/gr_cpci_ax2000.h index 211dc38dfa..7f6586fa0e 100644 --- a/include/configs/gr_cpci_ax2000.h +++ b/include/configs/gr_cpci_ax2000.h @@ -49,9 +49,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION -#define CONFIG_ISO_PARTITION /* * Supported commands diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index ad0c126e27..4d28a97012 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -43,9 +43,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION -#define CONFIG_ISO_PARTITION /* * Supported commands diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h index b0e90018e2..b91ab850aa 100644 --- a/include/configs/gr_xc3s_1500.h +++ b/include/configs/gr_xc3s_1500.h @@ -30,9 +30,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION -#define CONFIG_ISO_PARTITION /* * Supported commands diff --git a/include/configs/grsim.h b/include/configs/grsim.h index 17cac5adb8..8c1c8b471e 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -41,9 +41,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION -#define CONFIG_ISO_PARTITION /* * Supported commands diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index 16427939d0..3651017aa9 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -36,9 +36,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION -#define CONFIG_ISO_PARTITION /* * Supported commands diff --git a/include/configs/h2200.h b/include/configs/h2200.h index 18b5488392..e22cf09c44 100644 --- a/include/configs/h2200.h +++ b/include/configs/h2200.h @@ -9,7 +9,6 @@ #ifndef __CONFIG_H #define __CONFIG_H -#define MACH_TYPE_H2200 341 #define CONFIG_MACH_TYPE MACH_TYPE_H2200 #define CONFIG_CPU_PXA25X 1 diff --git a/include/configs/harmony.h b/include/configs/harmony.h index e9781ccf5f..923c38f968 100644 --- a/include/configs/harmony.h +++ b/include/configs/harmony.h @@ -26,9 +26,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_HARMONY -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* NAND support */ #define CONFIG_CMD_NAND #define CONFIG_TEGRA_NAND diff --git a/include/configs/hikey.h b/include/configs/hikey.h index 0f6f11755d..9ec81402b4 100644 --- a/include/configs/hikey.h +++ b/include/configs/hikey.h @@ -69,7 +69,6 @@ #define CONFIG_HIKEY_GPIO /* SD/MMC configuration */ -#define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_FS_EXT4 diff --git a/include/configs/hrcon.h b/include/configs/hrcon.h index 079c4cfdcc..5528dfc810 100644 --- a/include/configs/hrcon.h +++ b/include/configs/hrcon.h @@ -26,9 +26,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - #define CONFIG_CMD_FPGAD #define CONFIG_CMD_IOLOOP diff --git a/include/configs/ib62x0.h b/include/configs/ib62x0.h index f686c7ff57..ec209a1c9b 100644 --- a/include/configs/ib62x0.h +++ b/include/configs/ib62x0.h @@ -92,7 +92,6 @@ #ifdef CONFIG_CMD_IDE #define __io #define CONFIG_IDE_PREINIT -#define CONFIG_DOS_PARTITION #define CONFIG_MVSATA_IDE_USE_PORT0 #define CONFIG_MVSATA_IDE_USE_PORT1 #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET diff --git a/include/configs/icon.h b/include/configs/icon.h index 29d33650c1..22e5f87286 100644 --- a/include/configs/icon.h +++ b/include/configs/icon.h @@ -223,7 +223,6 @@ #define CONFIG_SYSTEMACE /* Enable SystemACE support */ #define CONFIG_SYS_SYSTEMACE_WIDTH 16 /* Data bus width is 16 */ #define CONFIG_SYS_SYSTEMACE_BASE CONFIG_SYS_ACE_BASE -#define CONFIG_DOS_PARTITION /* * External Bus Controller (EBC) Setup diff --git a/include/configs/iconnect.h b/include/configs/iconnect.h index 0ea6fcb82c..633941b7dd 100644 --- a/include/configs/iconnect.h +++ b/include/configs/iconnect.h @@ -17,6 +17,11 @@ #define CONFIG_SKIP_LOWLEVEL_INIT /* disable board lowlevel_init */ /* + * Machine type + */ +#define CONFIG_MACH_TYPE MACH_TYPE_ICONNECT + +/* * Compression configuration */ #define CONFIG_BZIP2 diff --git a/include/configs/imx27lite-common.h b/include/configs/imx27lite-common.h index 0936344c60..cbd1dbc9c1 100644 --- a/include/configs/imx27lite-common.h +++ b/include/configs/imx27lite-common.h @@ -135,12 +135,6 @@ #define CONFIG_MXC_NAND_HWECC /* - * SD/MMC - */ -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - -/* * GPIO */ #define CONFIG_MXC_GPIO diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 79a716e558..b2131e88ee 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -61,9 +61,6 @@ #define CONFIG_SYS_XLB_PIPELINING 1 /* Partitions */ -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION /* * BOOTP options diff --git a/include/configs/intip.h b/include/configs/intip.h index 5c8b68dfa5..3477059865 100644 --- a/include/configs/intip.h +++ b/include/configs/intip.h @@ -279,9 +279,6 @@ #define CONFIG_CMD_SDRAM /* Partitions */ -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION /* * PCI stuff diff --git a/include/configs/ipek01.h b/include/configs/ipek01.h index 3bd938efd9..1aeded18f5 100644 --- a/include/configs/ipek01.h +++ b/include/configs/ipek01.h @@ -77,9 +77,6 @@ #define CONFIG_EEPRO100 1 #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ -/* Partitions */ -#define CONFIG_DOS_PARTITION - /* USB */ #define CONFIG_USB_OHCI_NEW #define CONFIG_SYS_OHCI_BE_CONTROLLER diff --git a/include/configs/jetson-tk1.h b/include/configs/jetson-tk1.h index febedca5f2..7c0456c5ce 100644 --- a/include/configs/jetson-tk1.h +++ b/include/configs/jetson-tk1.h @@ -25,9 +25,6 @@ /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h index 26cbd6df3b..44345ddf8c 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -63,9 +63,6 @@ #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ /* Partitions */ -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION #define CONFIG_TIMESTAMP /* Print image info with timestamp */ diff --git a/include/configs/k2g_evm.h b/include/configs/k2g_evm.h index 81da8ff9e6..bd252312a2 100644 --- a/include/configs/k2g_evm.h +++ b/include/configs/k2g_evm.h @@ -60,9 +60,6 @@ #define CONFIG_PHY_MICREL #define PHY_ANEG_TIMEOUT 10000 /* PHY needs longer aneg time */ -/* MMC/SD */ -#define CONFIG_GENERIC_MMC - #undef CONFIG_ENV_IS_IN_NAND #define CONFIG_ENV_IS_IN_FAT #define FAT_ENV_INTERFACE "mmc" diff --git a/include/configs/katmai.h b/include/configs/katmai.h index 0ddd6c4596..45c1e06fbd 100644 --- a/include/configs/katmai.h +++ b/include/configs/katmai.h @@ -237,7 +237,6 @@ #define CONFIG_SYSTEMACE 1 /* Enable SystemACE support */ #define CONFIG_SYS_SYSTEMACE_WIDTH 16 /* Data bus width is 16 */ #define CONFIG_SYS_SYSTEMACE_BASE CONFIG_SYS_ACE_BASE -#define CONFIG_DOS_PARTITION 1 /*----------------------------------------------------------------------- * External Bus Controller (EBC) Setup diff --git a/include/configs/kc1.h b/include/configs/kc1.h index c0562fd480..33b6a987ae 100644 --- a/include/configs/kc1.h +++ b/include/configs/kc1.h @@ -85,12 +85,6 @@ #define CONFIG_SYS_NO_FLASH /* - * MMC - */ - -#define CONFIG_GENERIC_MMC - -/* * Power */ @@ -103,13 +97,6 @@ #define CONFIG_TWL6030_INPUT /* - * Partitions - */ - -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART - -/* * SPL */ diff --git a/include/configs/km/km_arm.h b/include/configs/km/km_arm.h index b8698de9c2..56d3f0260a 100644 --- a/include/configs/km/km_arm.h +++ b/include/configs/km/km_arm.h @@ -20,10 +20,6 @@ #ifndef _CONFIG_KM_ARM_H #define _CONFIG_KM_ARM_H - -/* We got removed from Linux mach-types.h */ -#define MACH_TYPE_KM_KIRKWOOD 2255 - /* * High Level Configuration Options (easy to change) */ diff --git a/include/configs/km/kmp204x-common.h b/include/configs/km/kmp204x-common.h index 6796f09985..efd3b28900 100644 --- a/include/configs/km/kmp204x-common.h +++ b/include/configs/km/kmp204x-common.h @@ -344,7 +344,6 @@ int get_scl(void); #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION /* RGMII (FM1@DTESC5) is used as debug itf, it's the only one configured */ #define CONFIG_SYS_FM1_DTSEC5_PHY_ADDR 0x11 diff --git a/include/configs/koelsch.h b/include/configs/koelsch.h index c7aa7cc084..6371c5b906 100644 --- a/include/configs/koelsch.h +++ b/include/configs/koelsch.h @@ -94,7 +94,6 @@ #define CONFIG_SMSTP7_ENA 0x00200000 /* SD */ -#define CONFIG_GENERIC_MMC #define CONFIG_SH_SDHI_FREQ 97500000 #endif /* __KOELSCH_H */ diff --git a/include/configs/kzm9g.h b/include/configs/kzm9g.h index 2e672b35eb..a193688f9d 100644 --- a/include/configs/kzm9g.h +++ b/include/configs/kzm9g.h @@ -22,7 +22,6 @@ #define CONFIG_CMDLINE_TAG #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_INITRD_TAG -#define CONFIG_DOS_PARTITION #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "root=/dev/null console=ttySC4,115200" diff --git a/include/configs/lacie_kw.h b/include/configs/lacie_kw.h index 4804fe0ad0..61e658c66a 100644 --- a/include/configs/lacie_kw.h +++ b/include/configs/lacie_kw.h @@ -15,10 +15,8 @@ #elif defined(CONFIG_NETSPACE_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_V2 #elif defined(CONFIG_NETSPACE_LITE_V2) -#define MACH_TYPE_NETSPACE_LITE_V2 2983 /* missing in mach-types.h */ #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_LITE_V2 #elif defined(CONFIG_NETSPACE_MINI_V2) -#define MACH_TYPE_NETSPACE_MINI_V2 2831 /* missing in mach-types.h */ #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MINI_V2 #elif defined(CONFIG_NETSPACE_MAX_V2) #define CONFIG_MACH_TYPE MACH_TYPE_NETSPACE_MAX_V2 @@ -135,8 +133,6 @@ /* * Partition support */ -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION /* * File systems support diff --git a/include/configs/lager.h b/include/configs/lager.h index a7894ca19b..f30cc16e91 100644 --- a/include/configs/lager.h +++ b/include/configs/lager.h @@ -86,8 +86,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 /* MMC */ -#define CONFIG_GENERIC_MMC - #define CONFIG_SH_MMCIF #define CONFIG_SH_MMCIF_ADDR 0xEE220000 #define CONFIG_SH_MMCIF_CLK 97500000 diff --git a/include/configs/legoev3.h b/include/configs/legoev3.h index bd4135e891..1d4e7cd6fc 100644 --- a/include/configs/legoev3.h +++ b/include/configs/legoev3.h @@ -213,17 +213,6 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_ENV_SIZE (16 << 10) -/* SD/MMC configuration */ -#define CONFIG_GENERIC_MMC - -/* - * Enable MMC commands only when - * MMC support is present - */ -#ifdef CONFIG_MMC -#define CONFIG_DOS_PARTITION -#endif - /* additions for new relocation code, must added to all boards */ #define CONFIG_SYS_SDRAM_BASE 0xc0000000 diff --git a/include/configs/ls1012afrdm.h b/include/configs/ls1012afrdm.h index 94f7460eab..f6f88e84c7 100644 --- a/include/configs/ls1012afrdm.h +++ b/include/configs/ls1012afrdm.h @@ -42,11 +42,6 @@ #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 #endif -#define CONFIG_DOS_PARTITION -#define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_GPT - #define CONFIG_CMD_MEMINFO #define CONFIG_CMD_MEMTEST #define CONFIG_SYS_MEMTEST_START 0x80000000 diff --git a/include/configs/ls1012aqds.h b/include/configs/ls1012aqds.h index 19d65e9063..5aaf3a7c6a 100644 --- a/include/configs/ls1012aqds.h +++ b/include/configs/ls1012aqds.h @@ -134,8 +134,6 @@ #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* SATA */ @@ -144,7 +142,6 @@ #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT #define CONFIG_CMD_SCSI -#define CONFIG_DOS_PARTITION #define CONFIG_SYS_SATA AHCI_BASE_ADDR @@ -152,9 +149,6 @@ #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_GPT #define CONFIG_PCIE1 /* PCIE controller 1 */ diff --git a/include/configs/ls1012ardb.h b/include/configs/ls1012ardb.h index d08502bd90..70d3a71eb3 100644 --- a/include/configs/ls1012ardb.h +++ b/include/configs/ls1012ardb.h @@ -47,8 +47,6 @@ #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* SATA */ @@ -57,7 +55,6 @@ #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT #define CONFIG_CMD_SCSI -#define CONFIG_DOS_PARTITION #define CONFIG_SYS_SATA AHCI_BASE_ADDR @@ -65,9 +62,6 @@ #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_GPT #define CONFIG_PCIE1 /* PCIE controller 1 */ diff --git a/include/configs/ls1021aiot.h b/include/configs/ls1021aiot.h index 3daa3450b4..4941c2ebc8 100644 --- a/include/configs/ls1021aiot.h +++ b/include/configs/ls1021aiot.h @@ -156,7 +156,6 @@ */ #define CONFIG_CMD_MMC #define CONFIG_FSL_ESDHC -#define CONFIG_GENERIC_MMC /* SATA */ #define CONFIG_CMD_SCSI @@ -175,10 +174,6 @@ CONFIG_SYS_SCSI_MAX_LUN) #define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION -#define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_GPT /* SPI */ #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) diff --git a/include/configs/ls1021aqds.h b/include/configs/ls1021aqds.h index fc41ea15b8..5c9b41f2e7 100644 --- a/include/configs/ls1021aqds.h +++ b/include/configs/ls1021aqds.h @@ -393,12 +393,6 @@ unsigned long get_board_ddr_clk(void); * MMC */ #define CONFIG_FSL_ESDHC -#define CONFIG_GENERIC_MMC - -#define CONFIG_DOS_PARTITION -#define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_GPT /* SPI */ #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) diff --git a/include/configs/ls1021atwr.h b/include/configs/ls1021atwr.h index b97ee34343..25e3f92cf5 100644 --- a/include/configs/ls1021atwr.h +++ b/include/configs/ls1021atwr.h @@ -294,12 +294,6 @@ * MMC */ #define CONFIG_FSL_ESDHC -#define CONFIG_GENERIC_MMC - -#define CONFIG_DOS_PARTITION -#define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_GPT /* SPI */ #if defined(CONFIG_QSPI_BOOT) || defined(CONFIG_SD_BOOT_QSPI) diff --git a/include/configs/ls1043a_common.h b/include/configs/ls1043a_common.h index 74278de047..ea7067c6ae 100644 --- a/include/configs/ls1043a_common.h +++ b/include/configs/ls1043a_common.h @@ -130,8 +130,6 @@ #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* DSPI */ diff --git a/include/configs/ls1043aqds.h b/include/configs/ls1043aqds.h index cf2efea7bb..98da408c99 100644 --- a/include/configs/ls1043aqds.h +++ b/include/configs/ls1043aqds.h @@ -97,11 +97,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SCSI -#define CONFIG_DOS_PARTITION - -#define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_GPT /* EEPROM */ #define CONFIG_ID_EEPROM diff --git a/include/configs/ls1043ardb.h b/include/configs/ls1043ardb.h index 4519ca9fcb..8fa3bb3a64 100644 --- a/include/configs/ls1043ardb.h +++ b/include/configs/ls1043ardb.h @@ -290,7 +290,6 @@ #ifndef CONFIG_CMD_EXT2 #define CONFIG_CMD_EXT2 #endif -#define CONFIG_DOS_PARTITION #define CONFIG_SYS_SCSI_MAX_SCSI_ID 2 #define CONFIG_SYS_SCSI_MAX_LUN 2 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ @@ -299,10 +298,6 @@ #define SCSI_DEV_ID 0x9170 #define CONFIG_SCSI_DEV_LIST {SCSI_VEND_ID, SCSI_DEV_ID} -#define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_GPT - #include <asm/fsl_secure_boot.h> #endif /* __LS1043ARDB_H__ */ diff --git a/include/configs/ls1046a_common.h b/include/configs/ls1046a_common.h index 965d6c9451..be65e4fd76 100644 --- a/include/configs/ls1046a_common.h +++ b/include/configs/ls1046a_common.h @@ -116,8 +116,6 @@ #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif #define CONFIG_FSL_CAAM /* Enable SEC/CAAM */ diff --git a/include/configs/ls1046aqds.h b/include/configs/ls1046aqds.h index 30947b24db..0e648b1ac8 100644 --- a/include/configs/ls1046aqds.h +++ b/include/configs/ls1046aqds.h @@ -152,11 +152,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SCSI -#define CONFIG_DOS_PARTITION - -#define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_GPT /* EEPROM */ #define CONFIG_ID_EEPROM diff --git a/include/configs/ls1046ardb.h b/include/configs/ls1046ardb.h index 6fffac5ed6..0168f96462 100644 --- a/include/configs/ls1046ardb.h +++ b/include/configs/ls1046ardb.h @@ -223,7 +223,6 @@ #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SCSI -#define CONFIG_DOS_PARTITION #define CONFIG_SYS_SATA AHCI_BASE_ADDR @@ -231,9 +230,6 @@ #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_GPT #define CONFIG_BOOTCOMMAND "sf probe 0:0;sf read $kernel_load" \ "$kernel_start $kernel_size;" \ diff --git a/include/configs/ls2080a_simu.h b/include/configs/ls2080a_simu.h index 07be30c48f..5dd0a1d3cb 100644 --- a/include/configs/ls2080a_simu.h +++ b/include/configs/ls2080a_simu.h @@ -136,8 +136,6 @@ #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* Debug Server firmware */ diff --git a/include/configs/ls2080aqds.h b/include/configs/ls2080aqds.h index 3b603fb852..9ad8486df4 100644 --- a/include/configs/ls2080aqds.h +++ b/include/configs/ls2080aqds.h @@ -51,7 +51,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SCSI -#define CONFIG_DOS_PARTITION #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1 #define CONFIG_SYS_SATA2 AHCI_BASE_ADDR2 @@ -60,9 +59,6 @@ unsigned long get_board_ddr_clk(void); #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_GPT /* undefined CONFIG_FSL_DDR_SYNC_REFRESH for simulator */ @@ -357,8 +353,6 @@ unsigned long get_board_ddr_clk(void); #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif /* Initial environment variables */ diff --git a/include/configs/ls2080ardb.h b/include/configs/ls2080ardb.h index f8ce494d2e..db9ad157ac 100644 --- a/include/configs/ls2080ardb.h +++ b/include/configs/ls2080ardb.h @@ -60,7 +60,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SCSI_AHCI #define CONFIG_SCSI_AHCI_PLAT #define CONFIG_SCSI -#define CONFIG_DOS_PARTITION #define CONFIG_SYS_SATA1 AHCI_BASE_ADDR1 #define CONFIG_SYS_SATA2 AHCI_BASE_ADDR2 @@ -69,9 +68,6 @@ unsigned long get_board_sys_clk(void); #define CONFIG_SYS_SCSI_MAX_LUN 1 #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -#define CONFIG_PARTITION_UUIDS -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_GPT /* undefined CONFIG_FSL_DDR_SYNC_REFRESH for simulator */ @@ -302,8 +298,6 @@ unsigned long get_board_sys_clk(void); #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_MMC_HAS_CAPBLT_VS33 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #endif #define CONFIG_MISC_INIT_R diff --git a/include/configs/lsxl.h b/include/configs/lsxl.h index 0caca4c20f..7ec82cd4bb 100644 --- a/include/configs/lsxl.h +++ b/include/configs/lsxl.h @@ -48,9 +48,6 @@ #define CONFIG_CMD_ENV #define CONFIG_CMD_IDE -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION - /* * mv-common.h should be defined after CMD configs since it used them * to enable certain macros diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 658e359b20..9bca8ac484 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -371,9 +371,6 @@ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* re-init HCD after CMD_RESET */ /* Partitions */ -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION /* * BOOTP options diff --git a/include/configs/m28evk.h b/include/configs/m28evk.h index 25884b4146..e39fbbae37 100644 --- a/include/configs/m28evk.h +++ b/include/configs/m28evk.h @@ -9,14 +9,12 @@ /* System configurations */ #define CONFIG_MX28 /* i.MX28 SoC */ -#define MACH_TYPE_M28EVK 3613 #define CONFIG_MACH_TYPE MACH_TYPE_M28EVK #define CONFIG_TIMESTAMP /* Print image info with timestamp */ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_CMD_BMP diff --git a/include/configs/m53evk.h b/include/configs/m53evk.h index 22397773d5..df7321f1b5 100644 --- a/include/configs/m53evk.h +++ b/include/configs/m53evk.h @@ -22,7 +22,6 @@ /* * U-Boot Commands */ -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_CMD_BMP @@ -81,7 +80,6 @@ * MMC Driver */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 diff --git a/include/configs/ma5d4evk.h b/include/configs/ma5d4evk.h index de83d6c97b..aed0f4b65f 100644 --- a/include/configs/ma5d4evk.h +++ b/include/configs/ma5d4evk.h @@ -19,7 +19,6 @@ /* * U-Boot Commands */ -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE /* @@ -87,7 +86,6 @@ * SD/MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #endif diff --git a/include/configs/manroland/common.h b/include/configs/manroland/common.h index 937febea21..7f3231bd0c 100644 --- a/include/configs/manroland/common.h +++ b/include/configs/manroland/common.h @@ -15,9 +15,6 @@ #define CONFIG_BOARD_EARLY_INIT_R -/* Partitions */ -#define CONFIG_DOS_PARTITION - /* * Command line configuration. */ diff --git a/include/configs/mccmon6.h b/include/configs/mccmon6.h new file mode 100644 index 0000000000..e7223fb714 --- /dev/null +++ b/include/configs/mccmon6.h @@ -0,0 +1,321 @@ +/* + * Copyright (C) 2016-2017 + * Lukasz Majewski, DENX Software Engineering, lukma@denx.de + * + * SPDX-License-Identifier: GPL-2.0+ + */ + +#ifndef __CONFIG_H +#define __CONFIG_H + +#include <config_distro_defaults.h> +#include "mx6_common.h" + +#define CONFIG_SPL_LIBCOMMON_SUPPORT +#include "imx6_spl.h" + +#define CONFIG_SPL_BOARD_INIT +#define CONFIG_SYS_UBOOT_START CONFIG_SYS_TEXT_BASE +#define CONFIG_SYS_UBOOT_BASE (CONFIG_SYS_FLASH_BASE + 0x80000) +#define CONFIG_SPL_OS_BOOT +#define CONFIG_SYS_OS_BASE (CONFIG_SYS_FLASH_BASE + 0x180000) +#define CONFIG_SYS_FDT_BASE (CONFIG_SYS_FLASH_BASE + 0x1980000) +#define CONFIG_SYS_FDT_SIZE (48 * SZ_1K) +#define CONFIG_SYS_SPL_ARGS_ADDR 0x18000000 + +/* + * Below defines are set but NOT really used since we by + * design force U-Boot run when we boot in development + * mode from SD card (SD2) + */ +#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR (0x800) +#define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS (0x80) +#define CONFIG_SYS_MMCSD_RAW_MODE_KERNEL_SECTOR (0x1000) +#define CONFIG_SPL_FS_LOAD_KERNEL_NAME "uImage" +#define CONFIG_SPL_FS_LOAD_ARGS_NAME "imx6q-mccmon.dtb" + +/* Size of malloc() pool */ +#define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) + +#define CONFIG_BOARD_EARLY_INIT_F +#define CONFIG_BOARD_LATE_INIT + +#define CONFIG_MXC_UART +#define CONFIG_MXC_UART_BASE UART1_BASE + +#define CONFIG_SYS_MEMTEST_START 0x10000000 +#define CONFIG_SYS_MEMTEST_END (CONFIG_SYS_MEMTEST_START + 500 * SZ_1M) + +#define CONFIG_MXC_SPI +#define CONFIG_SF_DEFAULT_BUS 2 +#define CONFIG_SF_DEFAULT_CS 0 +#define CONFIG_SF_DEFAULT_SPEED 25000000 +#define CONFIG_SF_DEFAULT_MODE (SPI_MODE_0) + +/* I2C Configs */ +#define CONFIG_SYS_I2C +#define CONFIG_SYS_I2C_MXC +#define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ +#define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ +#define CONFIG_SYS_I2C_SPEED 100000 + +/* MMC Configuration */ +#define CONFIG_SYS_FSL_USDHC_NUM 2 +#define CONFIG_SYS_FSL_ESDHC_ADDR 0 + +#undef CONFIG_SYS_NO_FLASH +/* NOR 16-bit mode */ +#define CONFIG_SYS_FLASH_BASE WEIM_ARB_BASE_ADDR +#define CONFIG_SYS_FLASH_PROTECTION +#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT +#define CONFIG_SYS_FLASH_CFI /* Flash memory is CFI compliant */ +#define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* Use buffered writes*/ +#define CONFIG_SYS_FLASH_EMPTY_INFO +#define CONFIG_FLASH_CFI_DRIVER /* Use drivers/cfi_flash.c */ +#define CONFIG_FLASH_VERIFY + +/* NOR Flash MTD */ +#define CONFIG_FLASH_CFI_DRIVER +#define CONFIG_FLASH_CFI_MTD +#define CONFIG_SYS_MAX_FLASH_BANKS_DETECT 1 +#define CONFIG_SYS_FLASH_BANKS_LIST { (CONFIG_SYS_FLASH_BASE) } +#define CONFIG_SYS_FLASH_BANKS_SIZES { (32 * SZ_1M) } + +/* MTD support */ +#define CONFIG_CMD_MTDPARTS +#define CONFIG_MTD_DEVICE +#define CONFIG_MTD_PARTITIONS + +#define MTDIDS_DEFAULT "nor0=8000000.nor" +#define MTDPARTS_DEFAULT \ + "mtdparts=8000000.nor:" \ + "32m@0x0(mccmon6-image.nor)," \ + "256k@0x40000(u-boot-env.nor)," \ + "1m@0x80000(u-boot.nor)," \ + "8m@0x180000(kernel.nor)," \ + "8m@0x980000(swupdate-kernel.nor)," \ + "8m@0x1180000(swupdate-rootfs.nor)," \ + "128k@0x1980000(kernel-dtb.nor)," \ + "128k@0x19C0000(swupdate-kernel-dtb.nor)" + +/* USB Configs */ +#define CONFIG_USB_EHCI +#define CONFIG_USB_EHCI_MX6 +#define CONFIG_USB_STORAGE +#define CONFIG_USB_MAX_CONTROLLER_COUNT 2 +#define CONFIG_MXC_USB_PORTSC (PORT_PTS_UTMI | PORT_PTS_PTW) +#define CONFIG_MXC_USB_FLAGS 0 + +/* Ethernet Configuration */ +#define CONFIG_FEC_MXC +#define CONFIG_MII +#define IMX_FEC_BASE ENET_BASE_ADDR +#define CONFIG_FEC_XCV_TYPE RGMII +#define CONFIG_ETHPRIME "FEC" +#define CONFIG_FEC_MXC_PHYADDR 1 +#define CONFIG_PHYLIB +#define CONFIG_PHY_MICREL +#define CONFIG_PHY_MICREL_KSZ9031 + +#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG +#define CONFIG_EXTRA_ENV_SETTINGS \ + "console=ttymxc0,115200\0" \ + "fdtfile=imx6q-mccmon6.dtb\0" \ + "fdt_high=0xffffffff\0" \ + "initrd_high=0xffffffff\0" \ + "boot_os=yes\0" \ + "download_kernel=" \ + "tftpboot ${kernel_addr} ${kernel_file};" \ + "tftpboot ${fdt_addr} ${fdtfile};\0" \ + "get_boot_medium=" \ + "setenv boot_medium nor;" \ + "setexpr.l _src_sbmr1 *0x020d8004;" \ + "setexpr _b_medium ${_src_sbmr1} '&' 0x00000040;" \ + "if test ${_b_medium} = 40; then " \ + "setenv boot_medium sdcard;" \ + "fi\0" \ + "kernel_file=uImage\0" \ + "load_kernel=" \ + "load mmc ${bootdev}:${bootpart} ${kernel_addr} uImage;" \ + "load mmc ${bootdev}:${bootpart} ${fdt_addr} ${fdtfile};\0" \ + "boot_sd=" \ + "echo '#######################';" \ + "echo '# Factory SDcard Boot #';" \ + "echo '#######################';" \ + "setenv mmcdev 1;" \ + "setenv mmcfactorydev 0;" \ + "setenv mmcfactorypart 1;" \ + "run factory_flash_img;\0" \ + "boot_nor=" \ + "setenv kernelnor 0x08180000;" \ + "setenv dtbnor 0x09980000;" \ + "setenv bootargs console=${console} quiet " \ + ""MTDPARTS_DEFAULT" " \ + "root=/dev/mmcblk1 rootfstype=ext4 rw rootwait noinitrd;" \ + "cp.l ${dtbnor} ${dtbloadaddr} 0x8000;" \ + "bootm ${kernelnor} - ${dtbloadaddr};\0" \ + "boot_recovery=" \ + "echo '#######################';" \ + "echo '# RECOVERY SWU Boot #';" \ + "echo '#######################';" \ + "setenv rootfsloadaddr 0x13000000;" \ + "setenv swukernelnor 0x08980000;" \ + "setenv swurootfsnor 0x09180000;" \ + "setenv swudtbnor 0x099A0000;" \ + "setenv bootargs console=${console} " \ + ""MTDPARTS_DEFAULT" " \ + "ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}" \ + ":${hostname}::off root=/dev/ram rw;" \ + "cp.l ${swurootfsnor} ${rootfsloadaddr} 0x200000;" \ + "cp.l ${swudtbnor} ${dtbloadaddr} 0x8000;" \ + "bootm ${swukernelnor} ${rootfsloadaddr} ${dtbloadaddr};\0" \ + "boot_tftp=" \ + "echo '#######################';" \ + "echo '# TFTP Boot #';" \ + "echo '#######################';" \ + "if run download_kernel; then " \ + "setenv bootargs console=${console} " \ + "root=/dev/mmcblk0p2 rootwait;" \ + "bootm ${kernel_addr} - ${fdt_addr};" \ + "fi\0" \ + "bootcmd=" \ + "if test -n ${recovery_status}; then " \ + "run boot_recovery;" \ + "else " \ + "if test ! -n ${boot_medium}; then " \ + "run get_boot_medium;" \ + "if test ${boot_medium} = sdcard; then " \ + "run boot_sd;" \ + "else " \ + "run boot_nor;" \ + "fi;" \ + "else " \ + "if test ${boot_medium} = tftp; then " \ + "run boot_tftp;" \ + "fi;" \ + "fi;" \ + "fi\0" \ + "mtdparts=" MTDPARTS_DEFAULT "\0" \ + "fdt_addr=0x18000000\0" \ + "bootdev=1\0" \ + "bootpart=1\0" \ + "kernel_addr=" __stringify(CONFIG_LOADADDR) "\0" \ + "netdev=eth0\0" \ + "load_addr=0x11000000\0" \ + "dtbloadaddr=0x12000000\0" \ + "uboot_file=u-boot.img\0" \ + "SPL_file=SPL\0" \ + "load_uboot=tftp ${load_addr} ${uboot_file}\0" \ + "nor_img_addr=0x11000000\0" \ + "nor_img_file=core-image-lwn-mccmon6.nor\0" \ + "emmc_img_file=core-image-lwn-mccmon6.ext4\0" \ + "nor_bank_start=" __stringify(CONFIG_SYS_FLASH_BASE) "\0" \ + "nor_img_size=0x02000000\0" \ + "factory_script_file=factory.scr\0" \ + "factory_load_script=" \ + "if test -e mmc ${mmcdev}:${mmcfactorypart} " \ + "${factory_script_file}; then " \ + "load mmc ${mmcdev}:${mmcfactorypart} " \ + "${loadaddr} ${factory_script_file};" \ + "fi\0" \ + "factory_script=echo Running factory script from mmc${mmcdev} ...; " \ + "source ${loadaddr}\0" \ + "factory_flash_img="\ + "echo 'Flash mccmon6 with factory images'; " \ + "if run factory_load_script; then " \ + "run factory_script;" \ + "else " \ + "echo No factory script: ${factory_script_file} found on " \ + "device ${mmcdev};" \ + "run factory_nor_img;" \ + "run factory_eMMC_img;" \ + "fi\0" \ + "factory_eMMC_img="\ + "echo 'Update mccmon6 eMMC image'; " \ + "if load mmc ${mmcdev}:${mmcfactorypart} " \ + "${loadaddr} ${emmc_img_file}; then " \ + "setexpr fw_sz ${filesize} / 0x200;" \ + "setexpr fw_sz ${fw_sz} + 1;" \ + "mmc dev ${mmcfactorydev};" \ + "mmc write ${loadaddr} 0x0 ${fw_sz};" \ + "fi\0" \ + "factory_nor_img="\ + "echo 'Update mccmon6 NOR image'; " \ + "if load mmc ${mmcdev}:${mmcfactorypart} " \ + "${nor_img_addr} ${nor_img_file}; then " \ + "run nor_update;" \ + "fi\0" \ + "nor_update=" \ + "protect off ${nor_bank_start} +${nor_img_size};" \ + "erase ${nor_bank_start} +${nor_img_size};" \ + "setexpr nor_img_size ${nor_img_size} / 4; " \ + "cp.l ${nor_img_addr} ${nor_bank_start} ${nor_img_size}\0" \ + "tftp_nor_uboot="\ + "echo 'Update mccmon6 NOR U-BOOT via TFTP'; " \ + "setenv nor_img_file u-boot.img; " \ + "setenv nor_img_size 0x80000; " \ + "setenv nor_bank_start 0x08080000; " \ + "if tftpboot ${nor_img_addr} ${nor_img_file}; then " \ + "run nor_update;" \ + "fi\0" \ + "tftp_nor_uImg="\ + "echo 'Update mccmon6 NOR uImage via TFTP'; " \ + "setenv nor_img_file uImage; " \ + "setenv nor_img_size 0x500000; " \ + "setenv nor_bank_start 0x08180000; " \ + "if tftpboot ${nor_img_addr} ${nor_img_file}; then " \ + "run nor_update;" \ + "fi\0" \ + "tftp_nor_img="\ + "echo 'Update mccmon6 NOR image via TFTP'; " \ + "if tftpboot ${nor_img_addr} ${nor_img_file}; then " \ + "run nor_update;" \ + "fi\0" \ + "tftp_nor_SPL="\ + "if tftp ${load_addr} SPL_padded; then " \ + "erase 0x08000000 +0x20000;" \ + "cp.b ${load_addr} 0x08000000 0x20000;" \ + "fi;\0" \ + "tftp_sd_SPL="\ + "if mmc dev 1; then " \ + "if tftp ${load_addr} ${SPL_file}; then " \ + "setexpr fw_sz ${filesize} / 0x200; " \ + "setexpr fw_sz ${fw_sz} + 1; " \ + "mmc write ${load_addr} 0x2 ${fw_sz};" \ + "fi;" \ + "fi;\0" \ + "tftp_sd_uboot="\ + "if mmc dev 1; then " \ + "if run load_uboot; then " \ + "setexpr fw_sz ${filesize} / 0x200; " \ + "setexpr fw_sz ${fw_sz} + 1; " \ + "mmc write ${load_addr} 0x8A ${fw_sz};" \ + "fi;" \ + "fi;\0" + +/* Physical Memory Map */ +#define CONFIG_NR_DRAM_BANKS 1 +#define PHYS_SDRAM MMDC0_ARB_BASE_ADDR + +#define CONFIG_SYS_SDRAM_BASE PHYS_SDRAM +#define CONFIG_SYS_INIT_RAM_ADDR IRAM_BASE_ADDR +#define CONFIG_SYS_INIT_RAM_SIZE IRAM_SIZE + +#define CONFIG_SYS_INIT_SP_OFFSET \ + (CONFIG_SYS_INIT_RAM_SIZE - GENERATED_GBL_DATA_SIZE) +#define CONFIG_SYS_INIT_SP_ADDR \ + (CONFIG_SYS_INIT_RAM_ADDR + CONFIG_SYS_INIT_SP_OFFSET) + +/* Environment organization */ +#define CONFIG_ENV_SIZE (SZ_128K) + +/* Envs are stored in NOR flash */ +#define CONFIG_ENV_IS_IN_FLASH +#define CONFIG_ENV_SECT_SIZE (SZ_128K) +#define CONFIG_ENV_ADDR (CONFIG_SYS_FLASH_BASE + 0x40000) + +#define CONFIG_SYS_REDUNDAND_ENVIRONMENT +#define CONFIG_ENV_ADDR_REDUND (CONFIG_SYS_FLASH_BASE + 0x60000) +#define CONFIG_ENV_SIZE_REDUND CONFIG_ENV_SIZE + +#endif /* __CONFIG_H * */ diff --git a/include/configs/mcx.h b/include/configs/mcx.h index 39cb446a59..5160758382 100644 --- a/include/configs/mcx.h +++ b/include/configs/mcx.h @@ -20,7 +20,6 @@ #define CONFIG_ARM_ERRATA_430973 #define CONFIG_ARM_ERRATA_621766 -#define MACH_TYPE_MCX 3656 #define CONFIG_MACH_TYPE MACH_TYPE_MCX #define CONFIG_EMIF4 /* The chip has EMIF4 controller */ @@ -80,8 +79,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION /* EHCI */ #define CONFIG_OMAP3_GPIO_2 diff --git a/include/configs/mecp5123.h b/include/configs/mecp5123.h index c9dbc5ab72..dadf438ac8 100644 --- a/include/configs/mecp5123.h +++ b/include/configs/mecp5123.h @@ -294,7 +294,6 @@ #undef CONFIG_CMD_FUSE #undef CONFIG_CMD_IDE #define CONFIG_CMD_JFFS2 -#define CONFIG_DOS_PARTITION /* * Watchdog timeout = CONFIG_SYS_WATCHDOG_VALUE * 65536 / IPS clock. diff --git a/include/configs/medcom-wide.h b/include/configs/medcom-wide.h index 1e94dac379..342bcf3051 100644 --- a/include/configs/medcom-wide.h +++ b/include/configs/medcom-wide.h @@ -19,9 +19,6 @@ #define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* NAND support */ #define CONFIG_CMD_NAND #define CONFIG_TEGRA_NAND diff --git a/include/configs/meesc.h b/include/configs/meesc.h index 5356e4c43a..af8bf3ad8e 100644 --- a/include/configs/meesc.h +++ b/include/configs/meesc.h @@ -29,14 +29,6 @@ */ #define CONFIG_SYS_TEXT_BASE 0x21F00000 -/* - * since a number of boards are not being listed in linux - * arch/arm/tools/mach-types any more, the mach-types have to be - * defined here - */ -#define MACH_TYPE_MEESC 2165 -#define MACH_TYPE_ETHERCAN2 2407 - /* ARM asynchronous clock */ #define CONFIG_SYS_AT91_SLOW_CLOCK 32768 /* 32.768 kHz crystal */ #define CONFIG_SYS_AT91_MAIN_CLOCK 16000000/* 16.0 MHz crystal */ diff --git a/include/configs/minnowmax.h b/include/configs/minnowmax.h index b01ab14ecf..7b9f90c08d 100644 --- a/include/configs/minnowmax.h +++ b/include/configs/minnowmax.h @@ -25,8 +25,6 @@ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA}, \ {PCI_VENDOR_ID_INTEL, PCI_DEVICE_ID_INTEL_VALLEYVIEW_SATA_ALT} -#define CONFIG_GENERIC_MMC - #undef CONFIG_USB_MAX_CONTROLLER_COUNT #define CONFIG_USB_MAX_CONTROLLER_COUNT 1 diff --git a/include/configs/motionpro.h b/include/configs/motionpro.h index 9b8a7ea93c..ab1d9f1651 100644 --- a/include/configs/motionpro.h +++ b/include/configs/motionpro.h @@ -257,7 +257,6 @@ #define CONFIG_SYS_ATA_DATA_OFFSET 0x0060 #define CONFIG_SYS_ATA_REG_OFFSET CONFIG_SYS_ATA_DATA_OFFSET #define CONFIG_SYS_ATA_STRIDE 4 -#define CONFIG_DOS_PARTITION /* * I2C configuration diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index 0159da4a21..fe9a703b64 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -437,11 +437,6 @@ "mpc5121.nand:-(data)" #if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2) || defined(CONFIG_CMD_USB) - -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION -#define CONFIG_ISO_PARTITION - #define CONFIG_SUPPORT_VFAT #endif /* defined(CONFIG_CMD_IDE) */ diff --git a/include/configs/ms7720se.h b/include/configs/ms7720se.h index 87f8712ba7..e074350309 100644 --- a/include/configs/ms7720se.h +++ b/include/configs/ms7720se.h @@ -92,7 +92,6 @@ #define CONFIG_SYS_PIO_MODE 1 #define CONFIG_SYS_IDE_MAXBUS 1 -#define CONFIG_DOS_PARTITION 1 #define CONFIG_SYS_ATA_BASE_ADDR CONFIG_SYS_MARUBUN_IO /* base address */ #define CONFIG_SYS_ATA_IDE0_OFFSET 0x01F0 /* ide0 offste */ #define CONFIG_SYS_ATA_DATA_OFFSET 0 /* data reg offset */ diff --git a/include/configs/mt_ventoux.h b/include/configs/mt_ventoux.h index 2420612800..3172c0e725 100644 --- a/include/configs/mt_ventoux.h +++ b/include/configs/mt_ventoux.h @@ -19,7 +19,6 @@ #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (128 << 10) + \ 6 * 1024 * 1024) -#define MACH_TYPE_AM3517_MT_VENTOUX 3832 #define CONFIG_MACH_TYPE MACH_TYPE_AM3517_MT_VENTOUX #define CONFIG_BOOTFILE "uImage" diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 547f564ae9..25562fa12a 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -123,8 +123,6 @@ */ #if defined(CONFIG_CMD_USB) && !defined(CONFIG_DM) #define CONFIG_USB_EHCI /* Enable EHCI USB support */ -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION #define CONFIG_SUPPORT_VFAT #endif /* CONFIG_CMD_USB */ diff --git a/include/configs/mvebu_armada-8k.h b/include/configs/mvebu_armada-8k.h index 58b88016e2..ebc7fca3d1 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -114,20 +114,8 @@ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -/* MMC/SD IP block */ -#define CONFIG_GENERIC_MMC - #define CONFIG_SUPPORT_VFAT -/* DISK Partition support */ -#define CONFIG_EFI_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION -#define CONFIG_ISO_PARTITION /* Experimental */ - -#define CONFIG_CMD_PART -#define CONFIG_PARTITION_UUIDS - /* * PCI configuration */ diff --git a/include/configs/mvebu_db-88f3720.h b/include/configs/mvebu_db-88f3720.h index 49a4d89ab9..829f6938b1 100644 --- a/include/configs/mvebu_db-88f3720.h +++ b/include/configs/mvebu_db-88f3720.h @@ -126,18 +126,6 @@ #define CONFIG_SYS_SCSI_MAX_DEVICE (CONFIG_SYS_SCSI_MAX_SCSI_ID * \ CONFIG_SYS_SCSI_MAX_LUN) -/* MMC/SD IP block */ -#define CONFIG_GENERIC_MMC - #define CONFIG_SUPPORT_VFAT -/* DISK Partition support */ -#define CONFIG_EFI_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION -#define CONFIG_ISO_PARTITION /* Experimental */ - -#define CONFIG_CMD_PART -#define CONFIG_PARTITION_UUIDS - #endif /* _CONFIG_MVEBU_DB_88F3720_H */ diff --git a/include/configs/mx23_olinuxino.h b/include/configs/mx23_olinuxino.h index d05b9227d7..015d24618a 100644 --- a/include/configs/mx23_olinuxino.h +++ b/include/configs/mx23_olinuxino.h @@ -12,7 +12,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ diff --git a/include/configs/mx23evk.h b/include/configs/mx23evk.h index ecb6e4d961..4494bf6b4b 100644 --- a/include/configs/mx23evk.h +++ b/include/configs/mx23evk.h @@ -15,7 +15,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ diff --git a/include/configs/mx25pdk.h b/include/configs/mx25pdk.h index c818d3e2c5..528b193d70 100644 --- a/include/configs/mx25pdk.h +++ b/include/configs/mx25pdk.h @@ -84,7 +84,6 @@ #define CONFIG_ENV_OVERWRITE /* ESDHC driver */ -#define CONFIG_GENERIC_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR IMX_MMC_SDHC1_BASE #define CONFIG_SYS_FSL_ESDHC_NUM 1 @@ -96,8 +95,6 @@ #define CONFIG_POWER_FSL_MC34704 #define CONFIG_SYS_FSL_PMIC_I2C_ADDR 0x54 -#define CONFIG_DOS_PARTITION - /* I2C Configs */ #define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC diff --git a/include/configs/mx28evk.h b/include/configs/mx28evk.h index 5963d3929d..85ea54a91b 100644 --- a/include/configs/mx28evk.h +++ b/include/configs/mx28evk.h @@ -17,7 +17,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION #define CONFIG_CMD_DATE #define CONFIG_CMD_NAND diff --git a/include/configs/mx35pdk.h b/include/configs/mx35pdk.h index 22bfa147d2..22d319aceb 100644 --- a/include/configs/mx35pdk.h +++ b/include/configs/mx35pdk.h @@ -83,9 +83,6 @@ #define CONFIG_NET_RETRY_COUNT 100 #define CONFIG_CMD_DATE -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION - #define CONFIG_LOADADDR 0x80800000 /* loadaddr env var */ @@ -216,7 +213,6 @@ #define CONFIG_MXC_USB_PORTSC (MXC_EHCI_UTMI_16BIT | MXC_EHCI_MODE_UTMI) /* mmc driver */ -#define CONFIG_GENERIC_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 diff --git a/include/configs/mx51evk.h b/include/configs/mx51evk.h index 56650ba199..1f99a61b0d 100644 --- a/include/configs/mx51evk.h +++ b/include/configs/mx51evk.h @@ -65,9 +65,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR MMC_SDHC1_BASE_ADDR #define CONFIG_SYS_FSL_ESDHC_NUM 2 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - /* * Eth Configs */ diff --git a/include/configs/mx53ard.h b/include/configs/mx53ard.h index 28b3738144..c17d976354 100644 --- a/include/configs/mx53ard.h +++ b/include/configs/mx53ard.h @@ -52,9 +52,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 2 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - /* Eth Configs */ #define CONFIG_HAS_ETH1 #define CONFIG_MII diff --git a/include/configs/mx53cx9020.h b/include/configs/mx53cx9020.h index 6656f1306c..03e9a2abe0 100644 --- a/include/configs/mx53cx9020.h +++ b/include/configs/mx53cx9020.h @@ -36,10 +36,7 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 2 -#define CONFIG_GENERIC_MMC - /* bootz: zImage/initrd.img support */ -#define CONFIG_DOS_PARTITION /* Eth Configs */ #define CONFIG_MII diff --git a/include/configs/mx53evk.h b/include/configs/mx53evk.h index 76136a8945..839c8ccfae 100644 --- a/include/configs/mx53evk.h +++ b/include/configs/mx53evk.h @@ -50,9 +50,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 2 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - /* Eth Configs */ #define CONFIG_MII diff --git a/include/configs/mx53loco.h b/include/configs/mx53loco.h index 96c4b4f912..c7ab295899 100644 --- a/include/configs/mx53loco.h +++ b/include/configs/mx53loco.h @@ -36,9 +36,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 2 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - /* Eth Configs */ #define CONFIG_MII diff --git a/include/configs/mx53smd.h b/include/configs/mx53smd.h index 18dfa71d21..3ac89f2fc2 100644 --- a/include/configs/mx53smd.h +++ b/include/configs/mx53smd.h @@ -42,9 +42,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - /* Eth Configs */ #define CONFIG_HAS_ETH1 #define CONFIG_MII diff --git a/include/configs/mx6_common.h b/include/configs/mx6_common.h index 0a1563c6f5..cdf46f016e 100644 --- a/include/configs/mx6_common.h +++ b/include/configs/mx6_common.h @@ -65,7 +65,6 @@ /* Filesystems and image support */ #define CONFIG_SUPPORT_RAW_INITRD -#define CONFIG_DOS_PARTITION /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP @@ -82,7 +81,6 @@ #define CONFIG_MXC_GPIO /* MMC */ -#define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC diff --git a/include/configs/mx6qsabreauto.h b/include/configs/mx6qsabreauto.h index f849f3420a..7d68633c78 100644 --- a/include/configs/mx6qsabreauto.h +++ b/include/configs/mx6qsabreauto.h @@ -38,6 +38,7 @@ #define CONFIG_FLASH_CFI_DRIVER /* Use drivers/cfi_flash.c */ #define CONFIG_SYS_FLASH_USE_BUFFER_WRITE /* Use buffered writes*/ #define CONFIG_SYS_FLASH_EMPTY_INFO +#define CONFIG_SYS_FLASH_CFI_WIDTH FLASH_CFI_16BIT #define CONFIG_SYS_FSL_USDHC_NUM 2 #if defined(CONFIG_ENV_IS_IN_MMC) diff --git a/include/configs/mx6slevk.h b/include/configs/mx6slevk.h index e54982af2e..3e7e5a3997 100644 --- a/include/configs/mx6slevk.h +++ b/include/configs/mx6slevk.h @@ -15,8 +15,7 @@ #include "imx6_spl.h" #endif -#define MACH_TYPE_MX6SLEVK 4307 -#define CONFIG_MACH_TYPE MACH_TYPE_MX6SLEVK +#define CONFIG_MACH_TYPE MACH_TYPE_MX6SL_EVK /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (3 * SZ_1M) diff --git a/include/configs/mx6sxsabreauto.h b/include/configs/mx6sxsabreauto.h index 90a935bbd0..0742b4bf2e 100644 --- a/include/configs/mx6sxsabreauto.h +++ b/include/configs/mx6sxsabreauto.h @@ -114,19 +114,12 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC3_BASE_ADDR /* I2C Configs */ -#define CONFIG_SYS_I2C #define CONFIG_SYS_I2C_MXC #define CONFIG_SYS_I2C_MXC_I2C1 /* enable I2C bus 1 */ #define CONFIG_SYS_I2C_MXC_I2C2 /* enable I2C bus 2 */ #define CONFIG_SYS_I2C_MXC_I2C3 /* enable I2C bus 3 */ #define CONFIG_SYS_I2C_SPEED 100000 -/* PMIC */ -#define CONFIG_POWER -#define CONFIG_POWER_I2C -#define CONFIG_POWER_PFUZE100 -#define CONFIG_POWER_PFUZE100_I2C_ADDR 0x08 - /* NAND flash command */ #define CONFIG_CMD_NAND #define CONFIG_CMD_NAND_TRIMFFS diff --git a/include/configs/mx7_common.h b/include/configs/mx7_common.h index 3a9118f844..837d5f7322 100644 --- a/include/configs/mx7_common.h +++ b/include/configs/mx7_common.h @@ -37,9 +37,6 @@ #define CONFIG_CONS_INDEX 1 #define CONFIG_BAUDRATE 115200 -/* Filesystems and image support */ -#define CONFIG_DOS_PARTITION - /* Miscellaneous configurable options */ #define CONFIG_SYS_LONGHELP #define CONFIG_CMDLINE_EDITING @@ -58,7 +55,6 @@ #define CONFIG_MXC_UART /* MMC */ -#define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_FSL_ESDHC #define CONFIG_FSL_USDHC diff --git a/include/configs/mxs.h b/include/configs/mxs.h index 6a223b683f..12b456b3bd 100644 --- a/include/configs/mxs.h +++ b/include/configs/mxs.h @@ -146,7 +146,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #endif diff --git a/include/configs/nas220.h b/include/configs/nas220.h index 7cfdacd789..96bf833f94 100644 --- a/include/configs/nas220.h +++ b/include/configs/nas220.h @@ -13,10 +13,9 @@ #define _CONFIG_NAS220_H /* - * Machine type definition and ID + * Machine type ID */ -#define MACH_TYPE_NAS220 MACH_TYPE_RD88F6192_NAS -#define CONFIG_MACH_TYPE MACH_TYPE_NAS220 +#define CONFIG_MACH_TYPE MACH_TYPE_RD88F6192_NAS /* * High Level Configuration Options (easy to change) @@ -100,7 +99,6 @@ #define CONFIG_USB_EHCI /* Enable EHCI USB support */ #define CONFIG_USB_EHCI_KIRKWOOD /* on Kirkwood platform */ #define CONFIG_EHCI_IS_TDI -#define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_VFAT #endif /* CONFIG_CMD_USB */ @@ -128,7 +126,6 @@ /* * EFI partition */ -#define CONFIG_EFI_PARTITION /* * Date Time diff --git a/include/configs/nitrogen6x.h b/include/configs/nitrogen6x.h index ca55063f77..efa5065d9b 100644 --- a/include/configs/nitrogen6x.h +++ b/include/configs/nitrogen6x.h @@ -136,6 +136,7 @@ "fdt_addr=0x18000000\0" \ "boot_fdt=try\0" \ "ip_dyn=yes\0" \ + "usb_pgood_delay=2000\0" \ "mmcdevs=0 1\0" \ "mmcpart=1\0" \ "mmcroot=/dev/mmcblk0p2 rootwait rw\0" \ @@ -205,6 +206,7 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "bootdevs=" CONFIG_DRIVE_TYPES "\0" \ "umsdevs=" CONFIG_UMSDEVS "\0" \ + "usb_pgood_delay=2000\0" \ "console=ttymxc1\0" \ "clearenv=if sf probe || sf probe || sf probe 1 ; then " \ "sf erase 0xc0000 0x2000 && " \ diff --git a/include/configs/nokia_rx51.h b/include/configs/nokia_rx51.h index d2b8e39d55..7e2f9925c3 100644 --- a/include/configs/nokia_rx51.h +++ b/include/configs/nokia_rx51.h @@ -93,8 +93,6 @@ #define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE { 4800, 9600, 19200, 38400, 57600, 115200 } -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION /* USB */ #define CONFIG_USB_MUSB_UDC diff --git a/include/configs/nsa310s.h b/include/configs/nsa310s.h index 1987164a70..366ee55dbe 100644 --- a/include/configs/nsa310s.h +++ b/include/configs/nsa310s.h @@ -84,7 +84,6 @@ #ifdef CONFIG_CMD_IDE #define __io #define CONFIG_IDE_PREINIT -#define CONFIG_DOS_PARTITION #define CONFIG_MVSATA_IDE_USE_PORT0 #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET #endif /* CONFIG_CMD_IDE */ diff --git a/include/configs/nyan-big.h b/include/configs/nyan-big.h index be0889d443..acf9d66ae0 100644 --- a/include/configs/nyan-big.h +++ b/include/configs/nyan-big.h @@ -24,9 +24,6 @@ /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h index c51ea3d689..8a414c3b9a 100644 --- a/include/configs/o2dnt-common.h +++ b/include/configs/o2dnt-common.h @@ -61,9 +61,6 @@ #define CONFIG_SYS_XLB_PIPELINING 1 /* Partitions */ -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION #define CONFIG_TIMESTAMP /* Print image info with timestamp */ diff --git a/include/configs/omap3_cairo.h b/include/configs/omap3_cairo.h index 09f4ec0b74..b5d2b007e8 100644 --- a/include/configs/omap3_cairo.h +++ b/include/configs/omap3_cairo.h @@ -228,9 +228,8 @@ #define CONFIG_SERIAL2 #endif -/* Provide MACH_TYPE for compatibility with non-DT kernels */ -#define MACH_TYPE_OMAP3_CAIRO 3063 -#define CONFIG_MACH_TYPE MACH_TYPE_OMAP3_CAIRO +/* Provide the MACH_TYPE value the vendor kernel requires */ +#define CONFIG_MACH_TYPE 3063 /*----------------------------------------------------------------------- * FLASH and environment organization diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h index 05594627ae..8846aa6607 100644 --- a/include/configs/omap3_evm.h +++ b/include/configs/omap3_evm.h @@ -46,16 +46,11 @@ * ---------------------------------------------------------------------------- */ -/* MMC */ -#define CONFIG_GENERIC_MMC - /* SPL */ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" /* Partition tables */ -#define CONFIG_EFI_PARTITION -#define CONFIG_DOS_PARTITION /* USB * diff --git a/include/configs/omap5_uevm.h b/include/configs/omap5_uevm.h index 736d8043aa..df60b49c61 100644 --- a/include/configs/omap5_uevm.h +++ b/include/configs/omap5_uevm.h @@ -43,8 +43,6 @@ #define CONFIG_SYS_REDUNDAND_ENVIRONMENT /* Enhance our eMMC support / experience. */ -#define CONFIG_CMD_GPT -#define CONFIG_EFI_PARTITION #define CONFIG_HSMMC2_8BIT #define CONFIG_SUPPORT_EMMC_BOOT diff --git a/include/configs/omapl138_lcdk.h b/include/configs/omapl138_lcdk.h index 65354b0ead..8114de814b 100644 --- a/include/configs/omapl138_lcdk.h +++ b/include/configs/omapl138_lcdk.h @@ -324,10 +324,7 @@ #endif /* SD/MMC */ -#define CONFIG_GENERIC_MMC - #ifdef CONFIG_MMC -#define CONFIG_DOS_PARTITION #undef CONFIG_ENV_IS_IN_MMC #endif diff --git a/include/configs/openrd.h b/include/configs/openrd.h index c21b849122..51e4d90a2e 100644 --- a/include/configs/openrd.h +++ b/include/configs/openrd.h @@ -107,7 +107,6 @@ #endif /*CONFIG_MVSATA_IDE*/ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_MVEBU_MMC #define CONFIG_SYS_MMC_BASE KW_SDIO_BASE #endif /* CONFIG_CMD_MMC */ diff --git a/include/configs/p1_p2_rdb_pc.h b/include/configs/p1_p2_rdb_pc.h index f24ade9663..88876d639e 100644 --- a/include/configs/p1_p2_rdb_pc.h +++ b/include/configs/p1_p2_rdb_pc.h @@ -695,7 +695,6 @@ #define CONFIG_CMD_PCI #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* CONFIG_PCI */ #if defined(CONFIG_TSEC_ENET) @@ -840,12 +839,6 @@ #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR -#define CONFIG_GENERIC_MMC -#endif - -#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) \ - || defined(CONFIG_FSL_SATA) -#define CONFIG_DOS_PARTITION #endif #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/p1_twr.h b/include/configs/p1_twr.h index c605fbe246..d403f84617 100644 --- a/include/configs/p1_twr.h +++ b/include/configs/p1_twr.h @@ -271,7 +271,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #define CONFIG_CMD_PCI #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* CONFIG_PCI */ #if defined(CONFIG_TSEC_ENET) @@ -406,12 +405,6 @@ extern unsigned long get_board_sys_clk(unsigned long dummy); #ifdef CONFIG_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC85xx_ESDHC_ADDR -#define CONFIG_GENERIC_MMC -#endif - -#if defined(CONFIG_MMC) || defined(CONFIG_USB_EHCI) \ - || defined(CONFIG_FSL_SATA) -#define CONFIG_DOS_PARTITION #endif #undef CONFIG_WATCHDOG /* watchdog disabled */ diff --git a/include/configs/p2371-0000.h b/include/configs/p2371-0000.h index a1a518e18c..897add3dd0 100644 --- a/include/configs/p2371-0000.h +++ b/include/configs/p2371-0000.h @@ -21,9 +21,6 @@ /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/p2371-2180.h b/include/configs/p2371-2180.h index b80d8dbe0a..3cf0c87be4 100644 --- a/include/configs/p2371-2180.h +++ b/include/configs/p2371-2180.h @@ -21,9 +21,6 @@ /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/p2571.h b/include/configs/p2571.h index ef1ae3f806..76fb7cec87 100644 --- a/include/configs/p2571.h +++ b/include/configs/p2571.h @@ -22,9 +22,6 @@ /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/p2771-0000.h b/include/configs/p2771-0000.h index e1e3d72da0..791a48a3be 100644 --- a/include/configs/p2771-0000.h +++ b/include/configs/p2771-0000.h @@ -17,9 +17,6 @@ /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/paz00.h b/include/configs/paz00.h index 13d5aa916f..fe7be6983d 100644 --- a/include/configs/paz00.h +++ b/include/configs/paz00.h @@ -22,9 +22,6 @@ #define CONFIG_MACH_TYPE MACH_TYPE_PAZ00 -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) diff --git a/include/configs/pb1x00.h b/include/configs/pb1x00.h index c92948f725..10d39e0a29 100644 --- a/include/configs/pb1x00.h +++ b/include/configs/pb1x00.h @@ -104,7 +104,6 @@ /*---USB -------------------------------------------*/ #if 0 #define CONFIG_USB_OHCI -#define CONFIG_DOS_PARTITION #endif /*---ATA PCMCIA ------------------------------------*/ @@ -114,7 +113,6 @@ #define CONFIG_PCMCIA_SLOT_A #define CONFIG_ATAPI 1 -#define CONFIG_MAC_PARTITION 1 /* We run CF in "true ide" mode or a harddrive via pcmcia */ #define CONFIG_IDE_PCMCIA 1 diff --git a/include/configs/pcm030.h b/include/configs/pcm030.h index 4fb9966b44..47ded819c3 100644 --- a/include/configs/pcm030.h +++ b/include/configs/pcm030.h @@ -396,9 +396,6 @@ RTC configuration #define CONFIG_SYS_ATA_STRIDE 4 #define CONFIG_ATAPI 1 -/* we enable IDE and FAT support, so we also need partition support */ -#define CONFIG_DOS_PARTITION 1 - /* USB */ #define CONFIG_USB_OHCI diff --git a/include/configs/pcm051.h b/include/configs/pcm051.h index b19349aeb3..9ce976ce43 100644 --- a/include/configs/pcm051.h +++ b/include/configs/pcm051.h @@ -22,7 +22,6 @@ #include <configs/ti_am335x_common.h> #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ -#define MACH_TYPE_PCM051 4144 /* Until the next sync */ #define CONFIG_MACH_TYPE MACH_TYPE_PCM051 /* set to negative value for no autoboot */ diff --git a/include/configs/pcm052.h b/include/configs/pcm052.h index 182f22e147..283abfa726 100644 --- a/include/configs/pcm052.h +++ b/include/configs/pcm052.h @@ -69,9 +69,6 @@ /*#define CONFIG_ESDHC_DETECT_USE_EXTERN_IRQ1*/ -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR diff --git a/include/configs/pepper.h b/include/configs/pepper.h index 6034baa634..9552dd1bcb 100644 --- a/include/configs/pepper.h +++ b/include/configs/pepper.h @@ -16,7 +16,6 @@ #define CONFIG_SYS_I2C_EEPROM_ADDR 0x50 /* Mach type */ -#define MACH_TYPE_PEPPER 4207 /* Until the next sync */ #define CONFIG_MACH_TYPE MACH_TYPE_PEPPER #define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */ diff --git a/include/configs/pic32mzdask.h b/include/configs/pic32mzdask.h index e6fd249404..ffd1b28cba 100644 --- a/include/configs/pic32mzdask.h +++ b/include/configs/pic32mzdask.h @@ -88,11 +88,6 @@ #define CONFIG_BOOTP_GATEWAY #define CONFIG_BOOTP_HOSTNAME -/*----------------------------------------------------------------------- - * SDHC Configuration - */ -#define CONFIG_GENERIC_MMC - /*-------------------------------------------------- * USB Configuration */ @@ -102,12 +97,9 @@ * File System Configuration */ /* FAT FS */ -#define CONFIG_DOS_PARTITION -#define CONFIG_PARTITION_UUIDS #define CONFIG_SUPPORT_VFAT #define CONFIG_FS_FAT #define CONFIG_FAT_WRITE -#define CONFIG_CMD_PART /* EXT4 FS */ #define CONFIG_FS_EXT4 diff --git a/include/configs/pico-imx6ul.h b/include/configs/pico-imx6ul.h index 6b0c546696..63bd11ca46 100644 --- a/include/configs/pico-imx6ul.h +++ b/include/configs/pico-imx6ul.h @@ -34,9 +34,6 @@ #define CONFIG_FSL_USDHC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR USDHC1_BASE_ADDR - -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_EMMC_BOOT /* USB Configs */ diff --git a/include/configs/picosam9g45.h b/include/configs/picosam9g45.h index bf817d7bec..327db73dd3 100644 --- a/include/configs/picosam9g45.h +++ b/include/configs/picosam9g45.h @@ -91,14 +91,9 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #endif -#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC) -#define CONFIG_DOS_PARTITION -#endif - /* Ethernet */ #define CONFIG_MACB #define CONFIG_RMII diff --git a/include/configs/plutux.h b/include/configs/plutux.h index 889ef40670..911cad8cdd 100644 --- a/include/configs/plutux.h +++ b/include/configs/plutux.h @@ -19,9 +19,6 @@ #define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* NAND support */ #define CONFIG_CMD_NAND #define CONFIG_TEGRA_NAND diff --git a/include/configs/pm9261.h b/include/configs/pm9261.h index 9254722422..79b35d708e 100644 --- a/include/configs/pm9261.h +++ b/include/configs/pm9261.h @@ -31,7 +31,6 @@ #define CONFIG_ARCH_CPU_INIT #define CONFIG_SYS_TEXT_BASE 0 -#define MACH_TYPE_PM9261 1187 #define CONFIG_MACH_TYPE MACH_TYPE_PM9261 /* clocks */ @@ -225,7 +224,6 @@ #define CONFIG_USB_ATMEL #define CONFIG_USB_ATMEL_CLK_SEL_PLLB #define CONFIG_USB_OHCI_NEW 1 -#define CONFIG_DOS_PARTITION 1 #define CONFIG_SYS_USB_OHCI_CPU_INIT 1 #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00500000 #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9261" diff --git a/include/configs/pm9263.h b/include/configs/pm9263.h index ac1f7fbb53..ffea8c667b 100644 --- a/include/configs/pm9263.h +++ b/include/configs/pm9263.h @@ -31,7 +31,6 @@ #define CONFIG_ARCH_CPU_INIT #define CONFIG_SYS_TEXT_BASE 0 -#define MACH_TYPE_PM9263 1475 #define CONFIG_MACH_TYPE MACH_TYPE_PM9263 /* clocks */ @@ -254,7 +253,6 @@ #define CONFIG_USB_ATMEL #define CONFIG_USB_ATMEL_CLK_SEL_PLLB #define CONFIG_USB_OHCI_NEW 1 -#define CONFIG_DOS_PARTITION 1 #define CONFIG_SYS_USB_OHCI_CPU_INIT 1 #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00a00000 /* AT91SAM9263_UHP_BASE */ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9263" diff --git a/include/configs/pm9g45.h b/include/configs/pm9g45.h index 2ed977c29c..3ec8ee102b 100644 --- a/include/configs/pm9g45.h +++ b/include/configs/pm9g45.h @@ -25,7 +25,6 @@ #define CONFIG_PM9G45 1 /* It's an Ronetix PM9G45 */ #define CONFIG_SYS_AT91_CPU_NAME "AT91SAM9G45" -#define MACH_TYPE_PM9G45 2672 #define CONFIG_MACH_TYPE MACH_TYPE_PM9G45 /* ARM asynchronous clock */ @@ -110,7 +109,6 @@ #define CONFIG_USB_ATMEL #define CONFIG_USB_ATMEL_CLK_SEL_UPLL #define CONFIG_USB_OHCI_NEW 1 -#define CONFIG_DOS_PARTITION 1 #define CONFIG_SYS_USB_OHCI_CPU_INIT 1 #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00700000 /* _UHP_OHCI_BASE */ #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9g45" diff --git a/include/configs/pogo_e02.h b/include/configs/pogo_e02.h index fb1339c02d..e06caf617e 100644 --- a/include/configs/pogo_e02.h +++ b/include/configs/pogo_e02.h @@ -16,7 +16,6 @@ /* * Machine type definition and ID */ -#define MACH_TYPE_POGO_E02 3542 #define CONFIG_MACH_TYPE MACH_TYPE_POGO_E02 /* diff --git a/include/configs/porter.h b/include/configs/porter.h index ccaa796271..ed3125de90 100644 --- a/include/configs/porter.h +++ b/include/configs/porter.h @@ -88,7 +88,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* SD */ -#define CONFIG_GENERIC_MMC #define CONFIG_SH_SDHI_FREQ 97500000 /* Module stop status bits */ diff --git a/include/configs/pxa-common.h b/include/configs/pxa-common.h index 4598bd9881..345e6d6db4 100644 --- a/include/configs/pxa-common.h +++ b/include/configs/pxa-common.h @@ -22,9 +22,7 @@ * MMC Card Configuration */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_PXA_MMC_GENERIC -#define CONFIG_DOS_PARTITION #endif /* diff --git a/include/configs/pxm2.h b/include/configs/pxm2.h index d797a2ce4d..4776e97ed6 100644 --- a/include/configs/pxm2.h +++ b/include/configs/pxm2.h @@ -15,7 +15,6 @@ #define __CONFIG_PXM2_H #define CONFIG_SIEMENS_PXM2 -#define MACH_TYPE_PXM2 4309 #define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_PXM2 #include "siemens-am33x-common.h" diff --git a/include/configs/qemu-mips.h b/include/configs/qemu-mips.h index a6abba73f2..6fdf50bd26 100644 --- a/include/configs/qemu-mips.h +++ b/include/configs/qemu-mips.h @@ -54,7 +54,6 @@ #define CONFIG_CONS_INDEX 1 #define CONFIG_CMD_IDE -#define CONFIG_DOS_PARTITION #ifdef CONFIG_SYS_BIG_ENDIAN #define CONFIG_IDE_SWAP_IO diff --git a/include/configs/qemu-mips64.h b/include/configs/qemu-mips64.h index 7297a81b31..4ad230cb82 100644 --- a/include/configs/qemu-mips64.h +++ b/include/configs/qemu-mips64.h @@ -54,7 +54,6 @@ #define CONFIG_CONS_INDEX 1 #define CONFIG_CMD_IDE -#define CONFIG_DOS_PARTITION #ifdef CONFIG_SYS_BIG_ENDIAN #define CONFIG_IDE_SWAP_IO diff --git a/include/configs/qemu-ppce500.h b/include/configs/qemu-ppce500.h index 9f267877ab..c715d6d9e5 100644 --- a/include/configs/qemu-ppce500.h +++ b/include/configs/qemu-ppce500.h @@ -113,11 +113,9 @@ extern unsigned long long get_phys_ccsrbar_addr_early(void); #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* CONFIG_PCI */ #define CONFIG_LBA48 -#define CONFIG_DOS_PARTITION /* * Environment diff --git a/include/configs/r2dplus.h b/include/configs/r2dplus.h index f9da25c708..d37b39d3e8 100644 --- a/include/configs/r2dplus.h +++ b/include/configs/r2dplus.h @@ -13,7 +13,6 @@ */ #define CONFIG_CMD_PCI #define CONFIG_CMD_IDE -#define CONFIG_DOS_PARTITION #define CONFIG_CMD_SH_ZIMAGEBOOT /* SCIF */ diff --git a/include/configs/r7780mp.h b/include/configs/r7780mp.h index baadd876bc..9322f276fd 100644 --- a/include/configs/r7780mp.h +++ b/include/configs/r7780mp.h @@ -23,7 +23,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_PCI #define CONFIG_CMD_IDE -#define CONFIG_DOS_PARTITION #define CONFIG_SCIF_CONSOLE 1 #define CONFIG_BAUDRATE 115200 diff --git a/include/configs/rastaban.h b/include/configs/rastaban.h index 86d1ccd3b2..16ed1f0133 100644 --- a/include/configs/rastaban.h +++ b/include/configs/rastaban.h @@ -34,8 +34,6 @@ "led4=60,0,1\0" \ "led5=63,0,1\0" -#undef CONFIG_DOS_PARTITION - /* Physical Memory Map */ #define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ diff --git a/include/configs/rcar-gen2-common.h b/include/configs/rcar-gen2-common.h index 1338cd3469..39c40d3f82 100644 --- a/include/configs/rcar-gen2-common.h +++ b/include/configs/rcar-gen2-common.h @@ -18,7 +18,6 @@ /* Support File sytems */ #define CONFIG_FAT_WRITE -#define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_VFAT #define CONFIG_FS_EXT4 #define CONFIG_EXT4_WRITE diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h index 930f2d5f3c..5fe06866af 100644 --- a/include/configs/rcar-gen3-common.h +++ b/include/configs/rcar-gen3-common.h @@ -27,7 +27,6 @@ /* Support File sytems */ #define CONFIG_FAT_WRITE -#define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_VFAT #define CONFIG_FS_EXT4 #define CONFIG_EXT4_WRITE diff --git a/include/configs/rk3036_common.h b/include/configs/rk3036_common.h index 447c66f49f..cf2f20b506 100644 --- a/include/configs/rk3036_common.h +++ b/include/configs/rk3036_common.h @@ -37,12 +37,9 @@ #define CONFIG_ROCKCHIP_CHIP_TAG "RK30" /* MMC/SD IP block */ -#define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_FAT_WRITE -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART #define CONFIG_SYS_SDRAM_BASE 0x60000000 #define CONFIG_NR_DRAM_BANKS 1 diff --git a/include/configs/rk3288_common.h b/include/configs/rk3288_common.h index 37fcc2a67c..ff8a6ece4a 100644 --- a/include/configs/rk3288_common.h +++ b/include/configs/rk3288_common.h @@ -40,12 +40,9 @@ #define CONFIG_SPL_TEXT_BASE 0xff704004 /* MMC/SD IP block */ -#define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_FAT_WRITE -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART /* RAW SD card / eMMC locations. */ #define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10) diff --git a/include/configs/rk3399_common.h b/include/configs/rk3399_common.h index db0657b19d..ab8bfd188e 100644 --- a/include/configs/rk3399_common.h +++ b/include/configs/rk3399_common.h @@ -27,7 +27,6 @@ #define CONFIG_SYS_BOOTM_LEN (64 << 20) /* 64M */ /* MMC/SD IP block */ -#define CONFIG_GENERIC_MMC #define CONFIG_BOUNCE_BUFFER #define CONFIG_ROCKCHIP_SDHCI_MAX_FREQ 200000000 @@ -35,7 +34,6 @@ #define CONFIG_FS_FAT #define CONFIG_FAT_WRITE #define CONFIG_FS_EXT4 -#define CONFIG_CMD_PART /* RAW SD card / eMMC locations. */ #define CONFIG_SYS_SPI_U_BOOT_OFFS (128 << 10) diff --git a/include/configs/rockchip-common.h b/include/configs/rockchip-common.h index be53e659ee..9e71b3f78d 100644 --- a/include/configs/rockchip-common.h +++ b/include/configs/rockchip-common.h @@ -18,10 +18,7 @@ func(PXE, pxe, na) \ func(DHCP, dchp, na) - /* Enable gpt partition table */ -#define CONFIG_CMD_GPT #define CONFIG_RANDOM_UUID -#define CONFIG_PARTITION_UUIDS #define PARTS_DEFAULT \ "uuid_disk=${uuid_gpt_disk};" \ "name=loader1,start=32K,size=4000K,uuid=${uuid_gpt_loader1};" \ diff --git a/include/configs/rpi.h b/include/configs/rpi.h index ce539a008c..a545850668 100644 --- a/include/configs/rpi.h +++ b/include/configs/rpi.h @@ -24,6 +24,21 @@ (&((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_NR_DRAM_BANKS 1 #define CONFIG_SYS_SDRAM_BASE 0x00000000 @@ -66,9 +81,6 @@ #define CONFIG_VIDEO_BCM2835 #define CONFIG_SYS_WHITE_ON_BLACK -/* SD/MMC configuration */ -#define CONFIG_GENERIC_MMC - #ifdef CONFIG_CMD_USB #define CONFIG_USB_DWC2 #ifndef CONFIG_BCM2835 @@ -112,10 +124,6 @@ #define CONFIG_SYS_MAXARGS 16 #define CONFIG_COMMAND_HISTORY -/* Commands */ -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART - /* ATAGs support for bootm/bootz */ #define CONFIG_SETUP_MEMORY_TAGS #define CONFIG_CMDLINE_TAG diff --git a/include/configs/rut.h b/include/configs/rut.h index 36de45453f..51021e0e18 100644 --- a/include/configs/rut.h +++ b/include/configs/rut.h @@ -15,7 +15,6 @@ #define __CONFIG_RUT_H #define CONFIG_SIEMENS_RUT -#define MACH_TYPE_RUT 4316 #define CONFIG_SIEMENS_MACH_TYPE MACH_TYPE_RUT #include "siemens-am33x-common.h" diff --git a/include/configs/s32v234evb.h b/include/configs/s32v234evb.h index 4d048ba28b..33490c2869 100644 --- a/include/configs/s32v234evb.h +++ b/include/configs/s32v234evb.h @@ -82,9 +82,7 @@ #define CONFIG_SYS_FSL_ESDHC_NUM 1 #define CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC /* #define CONFIG_CMD_EXT2 EXT2 Support */ -#define CONFIG_DOS_PARTITION #if 0 diff --git a/include/configs/s5p_goni.h b/include/configs/s5p_goni.h index 6a61e5cd69..472c366972 100644 --- a/include/configs/s5p_goni.h +++ b/include/configs/s5p_goni.h @@ -47,7 +47,6 @@ #define CONFIG_BAUDRATE 115200 /* MMC */ -#define CONFIG_GENERIC_MMC #define SDHCI_MAX_HOSTS 4 /* PWM */ @@ -57,7 +56,6 @@ #define CONFIG_CMD_REGINFO #define CONFIG_CMD_ONENAND -#define CONFIG_CMD_GPT /* USB Composite download gadget - g_dnl */ #define CONFIG_SYS_DFU_DATA_BUF_SIZE SZ_32M @@ -214,15 +212,11 @@ #define CONFIG_SAMSUNG_ONENAND 1 #define CONFIG_SYS_ONENAND_BASE 0xB0000000 -#define CONFIG_DOS_PARTITION 1 - /* write support for filesystems */ #define CONFIG_FAT_WRITE #define CONFIG_EXT4_WRITE /* GPT */ -#define CONFIG_EFI_PARTITION -#define CONFIG_PARTITION_UUIDS #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) diff --git a/include/configs/sama5d2_ptc.h b/include/configs/sama5d2_ptc.h index 7a049d4580..6fbd05398b 100644 --- a/include/configs/sama5d2_ptc.h +++ b/include/configs/sama5d2_ptc.h @@ -84,7 +84,6 @@ #if defined(CONFIG_CMD_USB) #define CONFIG_CMD_FAT -#define CONFIG_DOS_PARTITION #endif /* Ethernet Hardware */ diff --git a/include/configs/sama5d2_xplained.h b/include/configs/sama5d2_xplained.h index 49b0419e9a..8e7358687a 100644 --- a/include/configs/sama5d2_xplained.h +++ b/include/configs/sama5d2_xplained.h @@ -41,20 +41,11 @@ /* NAND flash */ #undef CONFIG_CMD_NAND -/* MMC */ -#ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC -#endif - /* USB device */ #define CONFIG_USB_ETHER #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_MANUFACTURER "Atmel SAMA5D2 XPlained" -#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC) -#define CONFIG_DOS_PARTITION -#endif - /* I2C */ #define AT24MAC_ADDR 0x5c #define AT24MAC_REG 0x9a diff --git a/include/configs/sama5d3_xplained.h b/include/configs/sama5d3_xplained.h index b840315626..2a8b8a1a6e 100644 --- a/include/configs/sama5d3_xplained.h +++ b/include/configs/sama5d3_xplained.h @@ -81,7 +81,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #define CONFIG_ATMEL_MCI_8BIT #endif @@ -96,7 +95,6 @@ #define CONFIG_SYS_USB_OHCI_REGS_BASE ATMEL_BASE_OHCI #define CONFIG_SYS_USB_OHCI_SLOT_NAME "SAMA5D3 Xplained" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 2 -#define CONFIG_DOS_PARTITION #endif #if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC) diff --git a/include/configs/sama5d3xek.h b/include/configs/sama5d3xek.h index 026c80be87..05e96f9fc4 100644 --- a/include/configs/sama5d3xek.h +++ b/include/configs/sama5d3xek.h @@ -112,7 +112,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #define ATMEL_BASE_MMCI ATMEL_BASE_MCI0 #endif @@ -127,7 +126,6 @@ #define CONFIG_SYS_USB_OHCI_REGS_BASE ATMEL_BASE_OHCI #define CONFIG_SYS_USB_OHCI_SLOT_NAME "sama5d3" #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 3 -#define CONFIG_DOS_PARTITION #endif /* USB device */ diff --git a/include/configs/sama5d4_xplained.h b/include/configs/sama5d4_xplained.h index bcd5c37710..a017b26f87 100644 --- a/include/configs/sama5d4_xplained.h +++ b/include/configs/sama5d4_xplained.h @@ -64,7 +64,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #define ATMEL_BASE_MMCI ATMEL_BASE_MCI1 #endif @@ -82,10 +81,6 @@ #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_MANUFACTURER "Atmel SAMA5D4EK" -#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC) -#define CONFIG_DOS_PARTITION -#endif - /* Ethernet Hardware */ #define CONFIG_MACB #define CONFIG_RMII diff --git a/include/configs/sama5d4ek.h b/include/configs/sama5d4ek.h index 90097307bd..354e5104c5 100644 --- a/include/configs/sama5d4ek.h +++ b/include/configs/sama5d4ek.h @@ -64,7 +64,6 @@ /* MMC */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #define ATMEL_BASE_MMCI ATMEL_BASE_MCI1 #endif @@ -82,10 +81,6 @@ #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_MANUFACTURER "Atmel SAMA5D4EK" -#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC) -#define CONFIG_DOS_PARTITION -#endif - /* Ethernet Hardware */ #define CONFIG_MACB #define CONFIG_RMII diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index a430d598f5..25af94d885 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -43,19 +43,9 @@ #define CONFIG_EXT4_WRITE #define CONFIG_CMD_CBFS #define CONFIG_CMD_CRAMFS -#define CONFIG_CMD_PART -#define CONFIG_DOS_PARTITION #define CONFIG_HOST_MAX_DEVICES 4 #define CONFIG_CMD_MD5SUM -#define CONFIG_CMD_GPT -#define CONFIG_PARTITION_UUIDS -#define CONFIG_AMIGA_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION -#define CONFIG_ISO_PARTITION -#define CONFIG_MAC_PARTITION - /* * Size of malloc() pool, before and after relocation */ @@ -213,6 +203,4 @@ #define CONFIG_SYS_SYSTEMACE_WIDTH 16 #define CONFIG_SYS_SYSTEMACE_BASE 0 -#define CONFIG_GENERIC_MMC - #endif diff --git a/include/configs/sansa_fuze_plus.h b/include/configs/sansa_fuze_plus.h index 0b2821d98b..d97b15f037 100644 --- a/include/configs/sansa_fuze_plus.h +++ b/include/configs/sansa_fuze_plus.h @@ -11,7 +11,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ diff --git a/include/configs/sbc8641d.h b/include/configs/sbc8641d.h index 30eb114812..ebd76ea8ab 100644 --- a/include/configs/sbc8641d.h +++ b/include/configs/sbc8641d.h @@ -300,7 +300,6 @@ #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #undef CONFIG_SCSI_AHCI #ifdef CONFIG_SCSI_AHCI diff --git a/include/configs/sc_sps_1.h b/include/configs/sc_sps_1.h index 56a23a6ef0..c37f9131b9 100644 --- a/include/configs/sc_sps_1.h +++ b/include/configs/sc_sps_1.h @@ -11,12 +11,10 @@ /* System configuration */ #define CONFIG_MX28 /* i.MX28 SoC */ -#define MACH_TYPE_SC_SPS_1 4172 #define CONFIG_MACH_TYPE MACH_TYPE_SC_SPS_1 /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ diff --git a/include/configs/seaboard.h b/include/configs/seaboard.h index 388010cb5c..671afa71ec 100644 --- a/include/configs/seaboard.h +++ b/include/configs/seaboard.h @@ -31,9 +31,6 @@ /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index a913cbf7ca..572e6b1766 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -218,9 +218,6 @@ #endif /* CONFIG_440EPX */ /* Partitions */ -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION /* * Commands additional to the ones defined in amcc-common.h diff --git a/include/configs/sh7752evb.h b/include/configs/sh7752evb.h index 277cfd2203..77116049a7 100644 --- a/include/configs/sh7752evb.h +++ b/include/configs/sh7752evb.h @@ -18,8 +18,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_MD5SUM #define CONFIG_MD5 -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" @@ -87,7 +85,6 @@ #define CONFIG_SH_SPI_BASE 0xfe002000 /* MMCIF */ -#define CONFIG_GENERIC_MMC 1 #define CONFIG_SH_MMCIF 1 #define CONFIG_SH_MMCIF_ADDR 0xffcb0000 #define CONFIG_SH_MMCIF_CLK 48000000 diff --git a/include/configs/sh7753evb.h b/include/configs/sh7753evb.h index dd5b7ce484..49729f447e 100644 --- a/include/configs/sh7753evb.h +++ b/include/configs/sh7753evb.h @@ -18,8 +18,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_MD5SUM #define CONFIG_MD5 -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" @@ -87,7 +85,6 @@ #define CONFIG_SH_SPI_BASE 0xfe002000 /* MMCIF */ -#define CONFIG_GENERIC_MMC 1 #define CONFIG_SH_MMCIF 1 #define CONFIG_SH_MMCIF_ADDR 0xffcb0000 #define CONFIG_SH_MMCIF_CLK 48000000 diff --git a/include/configs/sh7757lcr.h b/include/configs/sh7757lcr.h index 2397db4d8c..0793f1e03e 100644 --- a/include/configs/sh7757lcr.h +++ b/include/configs/sh7757lcr.h @@ -18,8 +18,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_MD5SUM #define CONFIG_MD5 -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC2,115200 root=/dev/nfs ip=dhcp" @@ -88,7 +86,6 @@ #define CONFIG_SH_SPI_BASE 0xfe002000 /* MMCIF */ -#define CONFIG_GENERIC_MMC 1 #define CONFIG_SH_MMCIF 1 #define CONFIG_SH_MMCIF_ADDR 0xffcb0000 #define CONFIG_SH_MMCIF_CLK 48000000 diff --git a/include/configs/sh7785lcr.h b/include/configs/sh7785lcr.h index a74fd60aa7..1c3b701fe1 100644 --- a/include/configs/sh7785lcr.h +++ b/include/configs/sh7785lcr.h @@ -16,9 +16,6 @@ #define CONFIG_CMD_SDRAM #define CONFIG_CMD_SH_ZIMAGEBOOT -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION - #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS "console=ttySC1,115200 root=/dev/nfs ip=dhcp" diff --git a/include/configs/sheevaplug.h b/include/configs/sheevaplug.h index 9f22d4c1c6..a111057313 100644 --- a/include/configs/sheevaplug.h +++ b/include/configs/sheevaplug.h @@ -83,7 +83,6 @@ * SDIO/MMC Card Configuration */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_MVEBU_MMC #define CONFIG_SYS_MMC_BASE KW_SDIO_BASE #endif /* CONFIG_CMD_MMC */ @@ -94,7 +93,6 @@ #ifdef CONFIG_CMD_IDE #define __io #define CONFIG_IDE_PREINIT -#define CONFIG_DOS_PARTITION #define CONFIG_MVSATA_IDE_USE_PORT0 #define CONFIG_MVSATA_IDE_USE_PORT1 #define CONFIG_SYS_ATA_IDE0_OFFSET MV_SATA_PORT0_OFFSET diff --git a/include/configs/siemens-am33x-common.h b/include/configs/siemens-am33x-common.h index 1c76e12efd..327a806bee 100644 --- a/include/configs/siemens-am33x-common.h +++ b/include/configs/siemens-am33x-common.h @@ -76,9 +76,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default load address */ -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - #define CONFIG_SPI #define CONFIG_OMAP3_SPI #define CONFIG_MTD_DEVICE diff --git a/include/configs/silk.h b/include/configs/silk.h index a343cd1daa..b43de8de14 100644 --- a/include/configs/silk.h +++ b/include/configs/silk.h @@ -88,7 +88,6 @@ #define CONFIG_USB_MAX_CONTROLLER_COUNT 2 /* MMCIF */ -#define CONFIG_GENERIC_MMC #define CONFIG_SH_MMCIF #define CONFIG_SH_MMCIF_ADDR 0xee200000 #define CONFIG_SH_MMCIF_CLK 48000000 diff --git a/include/configs/smartweb.h b/include/configs/smartweb.h index 5ecc693fc8..748865d9bf 100644 --- a/include/configs/smartweb.h +++ b/include/configs/smartweb.h @@ -51,6 +51,7 @@ #define CONFIG_SYS_MAXARGS 32 /* setting board specific options */ +#define CONFIG_MACH_TYPE MACH_TYPE_SMARTWEB #define CONFIG_AUTO_COMPLETE #define CONFIG_ENV_OVERWRITE 1 /* Overwrite ethaddr / serial# */ #define CONFIG_AUTO_COMPLETE diff --git a/include/configs/smdkc100.h b/include/configs/smdkc100.h index 4292566592..f605f10cd8 100644 --- a/include/configs/smdkc100.h +++ b/include/configs/smdkc100.h @@ -187,8 +187,6 @@ #define CONFIG_SAMSUNG_ONENAND 1 #define CONFIG_SYS_ONENAND_BASE 0xE7100000 -#define CONFIG_DOS_PARTITION 1 - #define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_LOAD_ADDR - 0x1000000) /* diff --git a/include/configs/snapper9260.h b/include/configs/snapper9260.h index 8bd580660d..0e079b0356 100644 --- a/include/configs/snapper9260.h +++ b/include/configs/snapper9260.h @@ -64,7 +64,6 @@ #define CONFIG_USB_ATMEL #define CONFIG_USB_ATMEL_CLK_SEL_PLLB #define CONFIG_USB_OHCI_NEW -#define CONFIG_DOS_PARTITION #define CONFIG_SYS_USB_OHCI_CPU_INIT #define CONFIG_SYS_USB_OHCI_REGS_BASE ATMEL_UHP_BASE #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9260" diff --git a/include/configs/snapper9g45.h b/include/configs/snapper9g45.h index 8cfdcdea12..b0ed9eaf0e 100644 --- a/include/configs/snapper9g45.h +++ b/include/configs/snapper9g45.h @@ -65,11 +65,8 @@ #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_ATMEL #define CONFIG_SYS_USB_EHCI_MAX_ROOT_PORTS 2 -#define CONFIG_DOS_PARTITION -#define CONFIG_PARTITION_UUIDS /* MMC */ -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI /* LCD */ @@ -142,6 +139,5 @@ #define CONFIG_CMD_MMC #define CONFIG_CMD_NAND #define CONFIG_CMD_CACHE -#define CONFIG_CMD_PART #endif /* __CONFIG_H */ diff --git a/include/configs/sniper.h b/include/configs/sniper.h index 4d05786169..4f8a9f85f4 100644 --- a/include/configs/sniper.h +++ b/include/configs/sniper.h @@ -92,12 +92,6 @@ #define CONFIG_SYS_NO_FLASH /* - * MMC - */ - -#define CONFIG_GENERIC_MMC - -/* * Power */ @@ -110,13 +104,6 @@ #define CONFIG_TWL4030_INPUT /* - * Partitions - */ - -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART - -/* * SPL */ diff --git a/include/configs/socfpga_arria5_socdk.h b/include/configs/socfpga_arria5_socdk.h index 3b0b41612d..bc4d3cd9cc 100644 --- a/include/configs/socfpga_arria5_socdk.h +++ b/include/configs/socfpga_arria5_socdk.h @@ -10,7 +10,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_common.h b/include/configs/socfpga_common.h index 27bbd0ec5a..8bbe3c5eed 100644 --- a/include/configs/socfpga_common.h +++ b/include/configs/socfpga_common.h @@ -141,7 +141,6 @@ */ #ifdef CONFIG_CMD_MMC #define CONFIG_BOUNCE_BUFFER -#define CONFIG_GENERIC_MMC /* FIXME */ /* using smaller max blk cnt to avoid flooding the limited stack we have */ #define CONFIG_SYS_MMC_MAX_BLK_COUNT 256 /* FIXME -- SPL only? */ diff --git a/include/configs/socfpga_cyclone5_socdk.h b/include/configs/socfpga_cyclone5_socdk.h index 7ced6a68a6..5e317bb2e2 100644 --- a/include/configs/socfpga_cyclone5_socdk.h +++ b/include/configs/socfpga_cyclone5_socdk.h @@ -10,7 +10,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_de0_nano_soc.h b/include/configs/socfpga_de0_nano_soc.h index 6b9546e8f7..361019c093 100644 --- a/include/configs/socfpga_de0_nano_soc.h +++ b/include/configs/socfpga_de0_nano_soc.h @@ -10,7 +10,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_de1_soc.h b/include/configs/socfpga_de1_soc.h index deec647836..5e7a712cf5 100644 --- a/include/configs/socfpga_de1_soc.h +++ b/include/configs/socfpga_de1_soc.h @@ -10,7 +10,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_is1.h b/include/configs/socfpga_is1.h index cc07253aba..f102a1812f 100644 --- a/include/configs/socfpga_is1.h +++ b/include/configs/socfpga_is1.h @@ -11,7 +11,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_mcvevk.h b/include/configs/socfpga_mcvevk.h index d1b31c4cfa..d36fac6309 100644 --- a/include/configs/socfpga_mcvevk.h +++ b/include/configs/socfpga_mcvevk.h @@ -10,7 +10,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_sockit.h b/include/configs/socfpga_sockit.h index 3fceb31df9..16a85ae04c 100644 --- a/include/configs/socfpga_sockit.h +++ b/include/configs/socfpga_sockit.h @@ -10,7 +10,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_socrates.h b/include/configs/socfpga_socrates.h index c9473df912..0c8da60f4a 100644 --- a/include/configs/socfpga_socrates.h +++ b/include/configs/socfpga_socrates.h @@ -10,7 +10,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_sr1500.h b/include/configs/socfpga_sr1500.h index 424cada157..571e205136 100644 --- a/include/configs/socfpga_sr1500.h +++ b/include/configs/socfpga_sr1500.h @@ -9,7 +9,6 @@ #include <asm/arch/base_addr_ac5.h> #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socfpga_vining_fpga.h b/include/configs/socfpga_vining_fpga.h index 427d559143..a2d2b79c27 100644 --- a/include/configs/socfpga_vining_fpga.h +++ b/include/configs/socfpga_vining_fpga.h @@ -10,7 +10,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE #define CONFIG_HW_WATCHDOG diff --git a/include/configs/socrates.h b/include/configs/socrates.h index 6480116699..1bc520384c 100644 --- a/include/configs/socrates.h +++ b/include/configs/socrates.h @@ -403,6 +403,5 @@ #define CONFIG_SYS_USB_OHCI_MAX_ROOT_PORTS 15 #define CONFIG_SYS_USB_OHCI_SLOT_NAME "ohci_pci" #define CONFIG_SYS_OHCI_SWAP_REG_ACCESS 1 -#define CONFIG_DOS_PARTITION 1 #endif /* __CONFIG_H */ diff --git a/include/configs/stm32f746-disco.h b/include/configs/stm32f746-disco.h index b4a8f41014..d705830804 100644 --- a/include/configs/stm32f746-disco.h +++ b/include/configs/stm32f746-disco.h @@ -40,6 +40,12 @@ #define CONFIG_STM32_FLASH #define CONFIG_STM32X7_SERIAL +#define CONFIG_DESIGNWARE_ETH +#define CONFIG_DW_GMAC_DEFAULT_DMA_PBL (8) +#define CONFIG_DW_ALTDESCRIPTOR +#define CONFIG_MII +#define CONFIG_PHY_SMSC + #define CONFIG_STM32_HSE_HZ 25000000 #define CONFIG_SYS_CLK_FREQ 200000000 /* 200 MHz */ #define CONFIG_SYS_HZ_CLOCK 1000000 /* Timer is clocked at 1MHz */ @@ -54,8 +60,8 @@ + sizeof(CONFIG_SYS_PROMPT) + 16) #define CONFIG_SYS_MAXARGS 16 -#define CONFIG_SYS_MALLOC_LEN (16 * 1024) -#define CONFIG_STACKSIZE (64 << 10) +#define CONFIG_SYS_MALLOC_LEN (1 * 1024 * 1024) +#define CONFIG_STACKSIZE (256 * 1024) #define CONFIG_BAUDRATE 115200 #define CONFIG_BOOTARGS \ diff --git a/include/configs/stout.h b/include/configs/stout.h index d2bc050619..28bf5539df 100644 --- a/include/configs/stout.h +++ b/include/configs/stout.h @@ -89,9 +89,6 @@ #define CONFIG_USB_EHCI_RMOBILE #define CONFIG_USB_MAX_CONTROLLER_COUNT 3 -/* MMC */ -#define CONFIG_GENERIC_MMC - /* Module stop status bits */ /* INTC-RT */ #define CONFIG_SMSTP0_ENA 0x00400000 diff --git a/include/configs/strider.h b/include/configs/strider.h index a038ded2ae..f65e602299 100644 --- a/include/configs/strider.h +++ b/include/configs/strider.h @@ -26,9 +26,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR CONFIG_SYS_MPC83xx_ESDHC_ADDR -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - #define CONFIG_SYS_ALT_MEMTEST #define CONFIG_CMD_FPGAD diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index d58e5bacae..5d76e9ff9a 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -140,7 +140,6 @@ /* mmc config */ #ifdef CONFIG_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_MMC_SUNXI_SLOT 0 #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 /* first detected MMC controller */ @@ -338,7 +337,6 @@ extern int soft_i2c_gpio_scl; #ifdef CONFIG_MMC #define CONFIG_FASTBOOT_FLASH_MMC_DEV 0 -#define CONFIG_EFI_PARTITION #endif #endif diff --git a/include/configs/t4qds.h b/include/configs/t4qds.h index 82e4691ca3..7803a849bc 100644 --- a/include/configs/t4qds.h +++ b/include/configs/t4qds.h @@ -207,7 +207,6 @@ #define CONFIG_PCI_INDIRECT_BRIDGE #define CONFIG_PCI_SCAN_SHOW /* show pci devices on startup */ -#define CONFIG_DOS_PARTITION #endif /* CONFIG_PCI */ /* SATA */ @@ -225,7 +224,6 @@ #define CONFIG_LBA48 #define CONFIG_CMD_SATA -#define CONFIG_DOS_PARTITION #endif #ifdef CONFIG_FMAN_ENET diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h index 5ddc848e49..6bc2336b23 100644 --- a/include/configs/tam3517-common.h +++ b/include/configs/tam3517-common.h @@ -73,9 +73,6 @@ #define CONFIG_BAUDRATE 115200 #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - /* EHCI */ #define CONFIG_OMAP3_GPIO_5 #define CONFIG_USB_EHCI diff --git a/include/configs/tao3530.h b/include/configs/tao3530.h index 42d3060ec3..dafb05fa07 100644 --- a/include/configs/tao3530.h +++ b/include/configs/tao3530.h @@ -24,8 +24,6 @@ #define CONFIG_ARM_ERRATA_430973 #define CONFIG_ARM_ERRATA_621766 -#define MACH_TYPE_OMAP3_TAO3530 2836 - #define CONFIG_SDRC /* Has an SDRC controller */ #include <asm/arch/cpu.h> /* get chip and board defs */ @@ -70,8 +68,6 @@ /* allow to overwrite serial and ethaddr */ #define CONFIG_ENV_OVERWRITE #define CONFIG_BAUDRATE 115200 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION /* GPIO banks */ #define CONFIG_OMAP3_GPIO_2 /* GPIO32 ..63 is in GPIO bank 2 */ diff --git a/include/configs/tbs2910.h b/include/configs/tbs2910.h index 3b56be8b0b..09a7942650 100644 --- a/include/configs/tbs2910.h +++ b/include/configs/tbs2910.h @@ -48,11 +48,8 @@ /* *** Command definition *** */ #define CONFIG_CMD_BMODE -#define CONFIG_CMD_PART /* Filesystems / image support */ -#define CONFIG_EFI_PARTITION -#define CONFIG_PARTITION_UUIDS /* MMC */ #define CONFIG_SYS_FSL_USDHC_NUM 3 diff --git a/include/configs/tcm-bf537.h b/include/configs/tcm-bf537.h index 97aa046854..4d1cdb507b 100644 --- a/include/configs/tcm-bf537.h +++ b/include/configs/tcm-bf537.h @@ -118,7 +118,6 @@ /* * SPI_MMC Settings */ -#define CONFIG_GENERIC_MMC #define CONFIG_MMC_SPI /* diff --git a/include/configs/tec-ng.h b/include/configs/tec-ng.h index dbc9fc023e..06d8720df2 100644 --- a/include/configs/tec-ng.h +++ b/include/configs/tec-ng.h @@ -20,9 +20,6 @@ /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_ENV_OFFSET (-CONFIG_ENV_SIZE) diff --git a/include/configs/tec.h b/include/configs/tec.h index 278668c2c7..ebfca8f319 100644 --- a/include/configs/tec.h +++ b/include/configs/tec.h @@ -19,9 +19,6 @@ #define CONFIG_TEGRA_ENABLE_UARTD /* UARTD: debug UART */ #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* NAND support */ #define CONFIG_CMD_NAND #define CONFIG_TEGRA_NAND diff --git a/include/configs/tegra-common-post.h b/include/configs/tegra-common-post.h index 45600190a4..ab4136ab13 100644 --- a/include/configs/tegra-common-post.h +++ b/include/configs/tegra-common-post.h @@ -114,20 +114,7 @@ #ifdef CONFIG_CMD_I2C #endif -/* remove MMC support */ -#ifdef CONFIG_GENERIC_MMC -#undef CONFIG_GENERIC_MMC -#endif -#ifdef CONFIG_CMD_MMC -#endif - /* remove partitions/filesystems */ -#ifdef CONFIG_DOS_PARTITION -#undef CONFIG_DOS_PARTITION -#endif -#ifdef CONFIG_EFI_PARTITION -#undef CONFIG_EFI_PARTITION -#endif #ifdef CONFIG_FS_EXT4 #undef CONFIG_FS_EXT4 #endif @@ -145,15 +132,6 @@ #ifdef CONFIG_CMD_USB #endif -/* remove part command support */ -#ifdef CONFIG_PARTITION_UUIDS -#undef CONFIG_PARTITION_UUIDS -#endif - -#ifdef CONFIG_CMD_PART -#undef CONFIG_CMD_PART -#endif - #endif /* CONFIG_SPL_BUILD */ #endif /* __TEGRA_COMMON_POST_H */ diff --git a/include/configs/tegra-common.h b/include/configs/tegra-common.h index 8bdfade2e9..11e4df35e9 100644 --- a/include/configs/tegra-common.h +++ b/include/configs/tegra-common.h @@ -54,10 +54,6 @@ /* turn on command-line edit/hist/auto */ #define CONFIG_COMMAND_HISTORY -/* turn on commonly used storage-related commands */ -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART - #define CONFIG_SYS_NO_FLASH /* diff --git a/include/configs/theadorable.h b/include/configs/theadorable.h index 6b7299b152..d3c94b0e80 100644 --- a/include/configs/theadorable.h +++ b/include/configs/theadorable.h @@ -76,8 +76,6 @@ #define CONFIG_SATA_MV #define CONFIG_LIBATA #define CONFIG_LBA48 -#define CONFIG_EFI_PARTITION -#define CONFIG_DOS_PARTITION /* Additional FS support/configuration */ #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/thuban.h b/include/configs/thuban.h index b2891d8c85..9b73828df6 100644 --- a/include/configs/thuban.h +++ b/include/configs/thuban.h @@ -27,8 +27,6 @@ "led0=103,1,0\0" \ "led1=64,0,1\0" -#undef CONFIG_DOS_PARTITION - /* Physical Memory Map */ #define CONFIG_MAX_RAM_BANK_SIZE (1024 << 20) /* 1GB */ diff --git a/include/configs/ti814x_evm.h b/include/configs/ti814x_evm.h index a43b9776c4..aa4561c5f7 100644 --- a/include/configs/ti814x_evm.h +++ b/include/configs/ti814x_evm.h @@ -113,8 +113,6 @@ #define CONFIG_SYS_LOAD_ADDR 0x81000000 /* Default */ #define CONFIG_OMAP_GPIO -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION /** * Physical Memory Map diff --git a/include/configs/ti816x_evm.h b/include/configs/ti816x_evm.h index 9c8eabff4d..d7b1719b5b 100644 --- a/include/configs/ti816x_evm.h +++ b/include/configs/ti816x_evm.h @@ -52,8 +52,6 @@ #define CONFIG_CMD_ASKEN #define CONFIG_OMAP_GPIO -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION #define CONFIG_FS_FAT diff --git a/include/configs/ti_armv7_common.h b/include/configs/ti_armv7_common.h index 6a94cd7bb4..ca5794cec7 100644 --- a/include/configs/ti_armv7_common.h +++ b/include/configs/ti_armv7_common.h @@ -166,9 +166,6 @@ #define CONFIG_DM_I2C_COMPAT #endif -/* MMC/SD IP block */ -#define CONFIG_GENERIC_MMC - /* McSPI IP block */ #define CONFIG_SPI @@ -221,10 +218,7 @@ * enabled a number of useful commands and support. */ #if defined(CONFIG_MMC) || defined(CONFIG_USB_STORAGE) -#define CONFIG_DOS_PARTITION #define CONFIG_FAT_WRITE -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART #endif /* diff --git a/include/configs/ti_armv7_keystone2.h b/include/configs/ti_armv7_keystone2.h index f88501505f..d120c691e0 100644 --- a/include/configs/ti_armv7_keystone2.h +++ b/include/configs/ti_armv7_keystone2.h @@ -193,7 +193,6 @@ /* USB Configuration */ #define CONFIG_USB_XHCI_KEYSTONE #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 2 -#define CONFIG_EFI_PARTITION #define CONFIG_FS_FAT #define CONFIG_USB_SS_BASE KS2_USB_SS_BASE #define CONFIG_USB_HOST_XHCI_BASE KS2_USB_HOST_XHCI_BASE @@ -302,13 +301,6 @@ /* Now for the remaining common defines */ #include <configs/ti_armv7_common.h> -/* We wont be loading up OS from SPL for now.. */ - -/* We do not have MMC support.. yet.. */ -#undef CONFIG_GENERIC_MMC - -/* And no support for GPIO, yet.. */ - /* we may include files below only after all above definitions */ #include <asm/arch/hardware.h> #include <asm/arch/clock.h> diff --git a/include/configs/titanium.h b/include/configs/titanium.h index a53969f74f..4a12245810 100644 --- a/include/configs/titanium.h +++ b/include/configs/titanium.h @@ -17,8 +17,8 @@ #define CONFIG_MX6Q -#define MACH_TYPE_TITANIUM 3769 -#define CONFIG_MACH_TYPE MACH_TYPE_TITANIUM +/* Provide the MACH_TYPE value that the vendor kernel requires. */ +#define CONFIG_MACH_TYPE 3769 /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (2 * 1024 * 1024) diff --git a/include/configs/tplink_wdr4300.h b/include/configs/tplink_wdr4300.h index 6f780bc0b0..3576b4069b 100644 --- a/include/configs/tplink_wdr4300.h +++ b/include/configs/tplink_wdr4300.h @@ -62,8 +62,6 @@ #define CONFIG_EHCI_DESC_BIG_ENDIAN #define CONFIG_EHCI_IS_TDI -#define CONFIG_DOS_PARTITION - /* * Diagnostics */ diff --git a/include/configs/trats.h b/include/configs/trats.h index a771ddb27c..f027940c3d 100644 --- a/include/configs/trats.h +++ b/include/configs/trats.h @@ -40,10 +40,6 @@ #define CONFIG_SERIAL2 #define CONFIG_BAUDRATE 115200 -/* Console configuration */ - -/* MACH_TYPE_TRATS macro will be removed once added to mach-types */ -#define MACH_TYPE_TRATS 3928 #define CONFIG_MACH_TYPE MACH_TYPE_TRATS #define CONFIG_BOOTARGS "Please use defined boot" diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h index a961e5c0e6..654f9b4ec5 100644 --- a/include/configs/tricorder.h +++ b/include/configs/tricorder.h @@ -24,6 +24,7 @@ #define CONFIG_ARM_ERRATA_430973 #define CONFIG_ARM_ERRATA_621766 +#define CONFIG_MACH_TYPE MACH_TYPE_TRICORDER /* * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM * 64 bytes before this address should be set aside for u-boot.img's @@ -74,10 +75,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE {4800, 9600, 19200, 38400, 57600,\ 115200} -/* MMC */ -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - /* I2C */ #define CONFIG_SYS_I2C #define CONFIG_SYS_OMAP24_I2C_SPEED 100000 diff --git a/include/configs/trimslice.h b/include/configs/trimslice.h index 874351d9f9..2c37107a3c 100644 --- a/include/configs/trimslice.h +++ b/include/configs/trimslice.h @@ -27,9 +27,6 @@ /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in SPI */ #define CONFIG_ENV_IS_IN_SPI_FLASH #define CONFIG_ENV_SPI_MAX_HZ 48000000 diff --git a/include/configs/ts4600.h b/include/configs/ts4600.h index 9b7bd1b91d..2219a5362d 100644 --- a/include/configs/ts4600.h +++ b/include/configs/ts4600.h @@ -19,7 +19,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH /* No NOR Flash */ -#define CONFIG_DOS_PARTITION /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ diff --git a/include/configs/ts4800.h b/include/configs/ts4800.h index ac8c59f4f2..f2937779fa 100644 --- a/include/configs/ts4800.h +++ b/include/configs/ts4800.h @@ -21,6 +21,8 @@ #define CONFIG_HW_WATCHDOG +#define CONFIG_MACH_TYPE MACH_TYPE_TS48XX + /* text base address used when linking */ #define CONFIG_SYS_TEXT_BASE 0x90008000 @@ -57,9 +59,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR MMC_SDHC1_BASE_ADDR -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - /* * Eth Configs */ diff --git a/include/configs/twister.h b/include/configs/twister.h index fd117b8260..30ad241f7f 100644 --- a/include/configs/twister.h +++ b/include/configs/twister.h @@ -14,7 +14,6 @@ #include "tam3517-common.h" -#define MACH_TYPE_TAM3517 2818 #define CONFIG_MACH_TYPE MACH_TYPE_TAM3517 #define CONFIG_TAM3517_SW3_SETTINGS diff --git a/include/configs/udoo.h b/include/configs/udoo.h index 961062178d..90b682e100 100644 --- a/include/configs/udoo.h +++ b/include/configs/udoo.h @@ -13,8 +13,8 @@ #include "imx6_spl.h" -#define MACH_TYPE_UDOO 4800 -#define CONFIG_MACH_TYPE MACH_TYPE_UDOO +/* Provide the MACH_TYPE value that the vendor kernel requires. */ +#define CONFIG_MACH_TYPE 4800 /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (2 * SZ_1M) diff --git a/include/configs/udoo_neo.h b/include/configs/udoo_neo.h index 9835ce8875..23a3685bcd 100644 --- a/include/configs/udoo_neo.h +++ b/include/configs/udoo_neo.h @@ -34,6 +34,7 @@ "initrd_high=0xffffffff\0" \ "fdtfile=undefined\0" \ "fdt_addr=0x83000000\0" \ + "fdt_addr_r=0x83000000\0" \ "ip_dyn=yes\0" \ "mmcdev=0\0" \ "mmcrootfstype=ext4\0" \ @@ -47,11 +48,10 @@ "if test $board_name = EXTENDED; then " \ "setenv fdtfile imx6sx-udoo-neo-extended.dtb; fi; " \ "if test $fdtfile = UNDEFINED; then " \ - "echo WARNING: Could not determine dtb to use; fi; \0" \ + "echo WARNING: Could not determine dtb to use; fi\0" \ "kernel_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "pxefile_addr_r=" __stringify(CONFIG_LOADADDR) "\0" \ "ramdisk_addr_r=0x83000000\0" \ - "ramdiskaddr=0x83000000\0" \ "scriptaddr=" __stringify(CONFIG_LOADADDR) "\0" \ BOOTENV diff --git a/include/configs/uniphier.h b/include/configs/uniphier.h index 487d3defbc..22962392e2 100644 --- a/include/configs/uniphier.h +++ b/include/configs/uniphier.h @@ -15,6 +15,10 @@ #define CONFIG_SYS_EEPROM_PAGE_WRITE_DELAY_MS 10 +#ifdef CONFIG_ARM64 +#define CONFIG_CMD_UNZIP +#endif + /*----------------------------------------------------------------------- * MMU and Cache Setting *----------------------------------------------------------------------*/ @@ -76,7 +80,7 @@ /* #define CONFIG_ENV_IS_NOWHERE */ /* #define CONFIG_ENV_IS_IN_NAND */ #define CONFIG_ENV_IS_IN_MMC -#define CONFIG_ENV_OFFSET 0x80000 +#define CONFIG_ENV_OFFSET 0x100000 #define CONFIG_ENV_SIZE 0x2000 /* #define CONFIG_ENV_OFFSET_REDUND (CONFIG_ENV_OFFSET + CONFIG_ENV_SIZE) */ @@ -98,7 +102,6 @@ #define CONFIG_SYS_TIMER_RATE 1000000 #endif - #define CONFIG_SYS_MAX_NAND_DEVICE 1 #define CONFIG_SYS_NAND_MAX_CHIPS 2 #define CONFIG_SYS_NAND_ONFI_DETECTION @@ -121,11 +124,9 @@ /* USB */ #define CONFIG_SYS_USB_XHCI_MAX_ROOT_PORTS 4 #define CONFIG_FAT_WRITE -#define CONFIG_DOS_PARTITION /* SD/MMC */ #define CONFIG_SUPPORT_EMMC_BOOT -#define CONFIG_GENERIC_MMC /* memtest works on */ #define CONFIG_SYS_MEMTEST_START CONFIG_SYS_SDRAM_BASE @@ -144,6 +145,17 @@ #define CONFIG_CMDLINE_EDITING /* add command line history */ +#if defined(CONFIG_ARM64) && !defined(CONFIG_ARMV8_MULTIENTRY) +/* ARM Trusted Firmware */ +#define BOOT_IMAGES \ + "second_image=bl1.bin\0" \ + "third_image=fip.bin\0" +#else +#define BOOT_IMAGES \ + "second_image=u-boot-spl.bin\0" \ + "third_image=u-boot.bin\0" +#endif + #define CONFIG_BOOTCOMMAND "run $bootmode" #define CONFIG_ROOTPATH "/nfs/root/path" @@ -168,46 +180,54 @@ "__nfsboot=run tftpboot\0" #else #ifdef CONFIG_ARM64 -#define CONFIG_BOOTFILE "Image" +#define CONFIG_BOOTFILE "Image.gz" #define LINUXBOOT_CMD "booti" +#define KERNEL_ADDR_LOAD "kernel_addr_load=0x84200000\0" #define KERNEL_ADDR_R "kernel_addr_r=0x80080000\0" -#define KERNEL_SIZE "kernel_size=0x00c00000\0" -#define RAMDISK_ADDR "ramdisk_addr=0x00e00000\0" #else #define CONFIG_BOOTFILE "zImage" #define LINUXBOOT_CMD "bootz" +#define KERNEL_ADDR_LOAD "kernel_addr_load=0x80208000\0" #define KERNEL_ADDR_R "kernel_addr_r=0x80208000\0" -#define KERNEL_SIZE "kernel_size=0x00800000\0" -#define RAMDISK_ADDR "ramdisk_addr=0x00a00000\0" #endif #define LINUXBOOT_ENV_SETTINGS \ "fdt_addr=0x00100000\0" \ "fdt_addr_r=0x84100000\0" \ "fdt_size=0x00008000\0" \ "kernel_addr=0x00200000\0" \ + KERNEL_ADDR_LOAD \ KERNEL_ADDR_R \ - KERNEL_SIZE \ - RAMDISK_ADDR \ + "kernel_size=0x00800000\0" \ + "ramdisk_addr=0x00a00000\0" \ "ramdisk_addr_r=0x84a00000\0" \ "ramdisk_size=0x00600000\0" \ "ramdisk_file=rootfs.cpio.uboot\0" \ - "boot_common=setexpr bootm_low $kernel_addr_r '&' fe000000 &&" \ + "boot_common=setexpr bootm_low $kernel_addr_r '&' fe000000 && " \ + "if test $kernel_addr_load = $kernel_addr_r; then " \ + "true; " \ + "else " \ + "unzip $kernel_addr_load $kernel_addr_r; " \ + "fi && " \ LINUXBOOT_CMD " $kernel_addr_r $ramdisk_addr_r $fdt_addr_r\0" \ - "norboot=setexpr kernel_addr $nor_base + $kernel_addr &&" \ - "setexpr kernel_size $kernel_size / 4 &&" \ - "cp $kernel_addr $kernel_addr_r $kernel_size &&" \ - "setexpr ramdisk_addr_r $nor_base + $ramdisk_addr &&" \ - "setexpr fdt_addr_r $nor_base + $fdt_addr &&" \ + "norboot=setexpr kernel_addr_nor $nor_base + $kernel_addr && " \ + "setexpr kernel_size_div4 $kernel_size / 4 && " \ + "cp $kernel_addr_nor $kernel_addr_load $kernel_size_div4 && " \ + "setexpr ramdisk_addr_nor $nor_base + $ramdisk_addr && " \ + "setexpr ramdisk_size_div4 $ramdisk_size / 4 && " \ + "cp $ramdisk_addr_nor $ramdisk_addr_r $ramdisk_size_div4 && " \ + "setexpr fdt_addr_nor $nor_base + $fdt_addr && " \ + "setexpr fdt_size_div4 $fdt_size / 4 && " \ + "cp $fdt_addr_nor $fdt_addr_r $fdt_size_div4 && " \ "run boot_common\0" \ - "nandboot=nand read $kernel_addr_r $kernel_addr $kernel_size &&" \ + "nandboot=nand read $kernel_addr_load $kernel_addr $kernel_size && " \ "nand read $ramdisk_addr_r $ramdisk_addr $ramdisk_size &&" \ "nand read $fdt_addr_r $fdt_addr $fdt_size &&" \ "run boot_common\0" \ - "tftpboot=tftpboot $kernel_addr_r $bootfile &&" \ + "tftpboot=tftpboot $kernel_addr_load $bootfile && " \ "tftpboot $ramdisk_addr_r $ramdisk_file &&" \ "tftpboot $fdt_addr_r $fdt_file &&" \ "run boot_common\0" \ - "__nfsboot=tftpboot $kernel_addr_r $bootfile &&" \ + "__nfsboot=tftpboot $kernel_addr_load $bootfile && " \ "tftpboot $fdt_addr_r $fdt_file &&" \ "setenv ramdisk_addr_r - &&" \ "run boot_common\0" @@ -216,31 +236,38 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "netdev=eth0\0" \ "verify=n\0" \ + "initrd_high=0xffffffffffffffff\0" \ "nor_base=0x42000000\0" \ "sramupdate=setexpr tmp_addr $nor_base + 0x50000 &&" \ - "tftpboot $tmp_addr u-boot-spl.bin &&" \ - "setexpr tmp_addr $nor_base + 0x60000 &&" \ - "tftpboot $tmp_addr u-boot.bin\0" \ + "tftpboot $tmp_addr $second_image && " \ + "setexpr tmp_addr $nor_base + 0x70000 && " \ + "tftpboot $tmp_addr $third_image\0" \ "emmcupdate=mmcsetn &&" \ "mmc partconf $mmc_first_dev 0 1 1 &&" \ - "tftpboot u-boot-spl.bin &&" \ - "mmc write $loadaddr 0 80 &&" \ - "tftpboot u-boot.bin &&" \ - "mmc write $loadaddr 80 780\0" \ + "tftpboot $second_image && " \ + "mmc write $loadaddr 0 100 && " \ + "tftpboot $third_image && " \ + "mmc write $loadaddr 100 700\0" \ "nandupdate=nand erase 0 0x00100000 &&" \ - "tftpboot u-boot-spl.bin &&" \ - "nand write $loadaddr 0 0x00010000 &&" \ - "tftpboot u-boot.bin &&" \ - "nand write $loadaddr 0x00010000 0x000f0000\0" \ + "tftpboot $second_image && " \ + "nand write $loadaddr 0 0x00020000 && " \ + "tftpboot $third_image && " \ + "nand write $loadaddr 0x00020000 0x000e0000\0" \ + BOOT_IMAGES \ LINUXBOOT_ENV_SETTINGS #define CONFIG_SYS_BOOTMAPSZ 0x20000000 #define CONFIG_SYS_SDRAM_BASE 0x80000000 -#define CONFIG_NR_DRAM_BANKS 2 +#define CONFIG_NR_DRAM_BANKS 3 /* for LD20; the last 64 byte is used for dynamic DDR PHY training */ #define CONFIG_SYS_MEM_TOP_HIDE 64 +#define CONFIG_PANIC_HANG + +#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE) + +/* only for SPL */ #if defined(CONFIG_ARM64) #define CONFIG_SPL_TEXT_BASE 0x30000000 #elif defined(CONFIG_ARCH_UNIPHIER_SLD3) || \ @@ -258,9 +285,6 @@ #else #define CONFIG_SPL_STACK (0x00100000) #endif -#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_TEXT_BASE) - -#define CONFIG_PANIC_HANG #define CONFIG_SPL_FRAMEWORK #ifdef CONFIG_ARM64 @@ -269,21 +293,25 @@ #define CONFIG_SPL_BOARD_INIT -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x10000 +#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x20000 /* subtract sizeof(struct image_header) */ -#define CONFIG_SYS_UBOOT_BASE (0x60000 - 0x40) +#define CONFIG_SYS_UBOOT_BASE (0x70000 - 0x40) -#ifdef CONFIG_SPL #define CONFIG_SPL_TARGET "u-boot-with-spl.bin" #define CONFIG_SPL_MAX_FOOTPRINT 0x10000 +#if defined(CONFIG_ARCH_UNIPHIER_LD20) +#define CONFIG_SPL_MAX_SIZE 0x14000 +#else #define CONFIG_SPL_MAX_SIZE 0x10000 +#endif #if defined(CONFIG_ARCH_UNIPHIER_LD11) #define CONFIG_SPL_BSS_START_ADDR 0x30012000 #elif defined(CONFIG_ARCH_UNIPHIER_LD20) #define CONFIG_SPL_BSS_START_ADDR 0x30016000 #endif #define CONFIG_SPL_BSS_MAX_SIZE 0x2000 -#endif + +#define CONFIG_SPL_PAD_TO 0x20000 #endif /* __CONFIG_UNIPHIER_COMMON_H__ */ diff --git a/include/configs/usb_a9263.h b/include/configs/usb_a9263.h index 075d9c990b..a1ba428887 100644 --- a/include/configs/usb_a9263.h +++ b/include/configs/usb_a9263.h @@ -104,7 +104,6 @@ #ifdef CONFIG_CMD_USB #define CONFIG_USB_ATMEL #define CONFIG_USB_OHCI_NEW -#define CONFIG_DOS_PARTITION #define CONFIG_SYS_USB_OHCI_CPU_INIT #define CONFIG_SYS_USB_OHCI_REGS_BASE 0x00a00000 #define CONFIG_SYS_USB_OHCI_SLOT_NAME "at91sam9263" diff --git a/include/configs/usbarmory.h b/include/configs/usbarmory.h index b32cd6a391..01a2bd4060 100644 --- a/include/configs/usbarmory.h +++ b/include/configs/usbarmory.h @@ -42,7 +42,6 @@ #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 -#define CONFIG_GENERIC_MMC /* USB */ #define CONFIG_USB_EHCI diff --git a/include/configs/v38b.h b/include/configs/v38b.h index 1f48a41589..08359d14d6 100644 --- a/include/configs/v38b.h +++ b/include/configs/v38b.h @@ -57,12 +57,6 @@ */ /* - * Partitions - */ -#define CONFIG_MAC_PARTITION 1 -#define CONFIG_DOS_PARTITION 1 - -/* * USB */ #define CONFIG_USB_OHCI diff --git a/include/configs/vct.h b/include/configs/vct.h index 6ff22c2fb0..22f170c23c 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -97,9 +97,6 @@ #endif #if defined(CONFIG_CMD_USB) -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION - #define CONFIG_SUPPORT_VFAT /* diff --git a/include/configs/venice2.h b/include/configs/venice2.h index ec12133a30..9e83863c0a 100644 --- a/include/configs/venice2.h +++ b/include/configs/venice2.h @@ -22,9 +22,6 @@ /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC #define CONFIG_SYS_MMC_ENV_DEV 0 diff --git a/include/configs/ventana.h b/include/configs/ventana.h index 615acfe7e3..87b5136fac 100644 --- a/include/configs/ventana.h +++ b/include/configs/ventana.h @@ -18,8 +18,7 @@ #define CONFIG_TEGRA_ENABLE_UARTD #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTD_BASE -/* SD/MMC */ -#define CONFIG_GENERIC_MMC +#define CONFIG_MACH_TYPE MACH_TYPE_VENTANA /* Environment in eMMC, at the end of 2nd "boot sector" */ #define CONFIG_ENV_IS_IN_MMC diff --git a/include/configs/vexpress_aemv8a.h b/include/configs/vexpress_aemv8a.h index f026f356f3..3a4bfe8133 100644 --- a/include/configs/vexpress_aemv8a.h +++ b/include/configs/vexpress_aemv8a.h @@ -128,7 +128,6 @@ /*#define CONFIG_MENU_SHOW*/ #define CONFIG_CMD_UNZIP #define CONFIG_CMD_ENV -#define CONFIG_DOS_PARTITION /* BOOTP options */ #define CONFIG_BOOTP_BOOTFILESIZE diff --git a/include/configs/vexpress_common.h b/include/configs/vexpress_common.h index 0bc4ea58c5..3756e22ffa 100644 --- a/include/configs/vexpress_common.h +++ b/include/configs/vexpress_common.h @@ -150,7 +150,6 @@ #define CONFIG_SYS_SERIAL0 V2M_UART0 #define CONFIG_SYS_SERIAL1 V2M_UART1 -#define CONFIG_GENERIC_MMC #define CONFIG_ARM_PL180_MMCI #define CONFIG_ARM_PL180_MMCI_BASE V2M_MMCI #define CONFIG_SYS_MMC_MAX_BLK_COUNT 127 diff --git a/include/configs/vf610twr.h b/include/configs/vf610twr.h index a8cd96b02e..33b3438b06 100644 --- a/include/configs/vf610twr.h +++ b/include/configs/vf610twr.h @@ -66,9 +66,6 @@ #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 -#define CONFIG_GENERIC_MMC -#define CONFIG_DOS_PARTITION - #define CONFIG_FEC_MXC #define CONFIG_MII #define IMX_FEC_BASE ENET_BASE_ADDR diff --git a/include/configs/vinco.h b/include/configs/vinco.h index 07fe616687..b79ad5b76a 100644 --- a/include/configs/vinco.h +++ b/include/configs/vinco.h @@ -57,16 +57,12 @@ #ifdef CONFIG_CMD_MMC #define CONFIG_SUPPORT_EMMC_BOOT -#define CONFIG_GENERIC_MMC #define CONFIG_GENERIC_ATMEL_MCI #define ATMEL_BASE_MMCI ATMEL_BASE_MCI1 #define CONFIG_SYS_MMC_CLK_OD 500000 /* For generating MMC partitions */ -#define CONFIG_PARTITION_UUIDS #define CONFIG_RANDOM_UUID -#define CONFIG_EFI_PARTITION -#define CONFIG_CMD_GPT #endif @@ -83,10 +79,6 @@ #define CONFIG_USB_ETH_RNDIS #define CONFIG_USBNET_MANUFACTURER "L+G VInCo" -#if defined(CONFIG_CMD_USB) || defined(CONFIG_CMD_MMC) -#define CONFIG_DOS_PARTITION -#endif - /* Ethernet Hardware */ #define CONFIG_PHY_SMSC #define CONFIG_MACB diff --git a/include/configs/vining_2000.h b/include/configs/vining_2000.h index 0ff0a16171..ade5c2736f 100644 --- a/include/configs/vining_2000.h +++ b/include/configs/vining_2000.h @@ -109,8 +109,6 @@ #ifdef CONFIG_ENV_IS_IN_MMC #define CONFIG_SUPPORT_EMMC_BOOT -#define CONFIG_EFI_PARTITION -#define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_EMMC_RPMB #define CONFIG_SYS_MMC_ENV_DEV 0 /* USDHC4 eMMC */ /* 0=user, 1=boot0, 2=boot1, * 4..7=general0..3. */ diff --git a/include/configs/wandboard.h b/include/configs/wandboard.h index d337979f7c..7e9757a480 100644 --- a/include/configs/wandboard.h +++ b/include/configs/wandboard.h @@ -14,8 +14,7 @@ #include "imx6_spl.h" -#define MACH_TYPE_WANDBOARD 4412 -#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD +#define CONFIG_MACH_TYPE MACH_TYPE_WANDBOARD_IMX6 /* Size of malloc() pool */ #define CONFIG_SYS_MALLOC_LEN (10 * SZ_1M) diff --git a/include/configs/warp7.h b/include/configs/warp7.h index 4528f094ce..a8a4520843 100644 --- a/include/configs/warp7.h +++ b/include/configs/warp7.h @@ -24,9 +24,6 @@ #define CONFIG_SYS_FSL_ESDHC_HAS_DDR_MODE #define CONFIG_SYS_MMC_IMG_LOAD_PART 1 -#define CONFIG_PARTITION_UUIDS -#define CONFIG_CMD_PART - #define CONFIG_DFU_ENV_SETTINGS \ "dfu_alt_info=boot raw 0x2 0x400 mmcpart 1\0" \ diff --git a/include/configs/whistler.h b/include/configs/whistler.h index 30a48e83ca..429e5b6a32 100644 --- a/include/configs/whistler.h +++ b/include/configs/whistler.h @@ -19,12 +19,11 @@ #define CONFIG_TEGRA_UARTA_UAA_UAB #define CONFIG_SYS_NS16550_COM1 NV_PA_APB_UARTA_BASE +#define CONFIG_MACH_TYPE MACH_TYPE_WHISTLER + /* I2C */ #define CONFIG_SYS_I2C_TEGRA -/* SD/MMC */ -#define CONFIG_GENERIC_MMC - /* * Environment in eMMC, at the end of 2nd "boot sector". Note: This assumes * the user plugged the standard 8GB MoviNAND card into J29/HSMMC/POP. If diff --git a/include/configs/woodburn_common.h b/include/configs/woodburn_common.h index 4aaeea91fe..7fec24c65c 100644 --- a/include/configs/woodburn_common.h +++ b/include/configs/woodburn_common.h @@ -20,11 +20,6 @@ #define CONFIG_SYS_DCACHE_OFF -/* Only in case the value is not present in mach-types.h */ -#ifndef MACH_TYPE_FLEA3 -#define MACH_TYPE_FLEA3 3668 -#endif - #define CONFIG_MACH_TYPE MACH_TYPE_FLEA3 /* This is required to setup the ESDC controller */ @@ -60,7 +55,6 @@ #define CONFIG_RTC_MC13XXX /* mmc driver */ -#define CONFIG_GENERIC_MMC #define CONFIG_FSL_ESDHC #define CONFIG_SYS_FSL_ESDHC_ADDR 0 #define CONFIG_SYS_FSL_ESDHC_NUM 1 @@ -86,9 +80,6 @@ #define CONFIG_CMD_NAND -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION - #define CONFIG_MXC_GPIO #define CONFIG_NET_RETRY_COUNT 100 diff --git a/include/configs/work_92105.h b/include/configs/work_92105.h index 33e2b98bb5..dd02142e32 100644 --- a/include/configs/work_92105.h +++ b/include/configs/work_92105.h @@ -18,8 +18,7 @@ * Define work_92105 machine type by hand -- done only for compatibility * with original board code */ -#define MACH_TYPE_WORK_92105 736 -#define CONFIG_MACH_TYPE MACH_TYPE_WORK_92105 +#define CONFIG_MACH_TYPE 736 #define CONFIG_SYS_ICACHE_OFF #define CONFIG_SYS_DCACHE_OFF @@ -107,7 +106,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_CMDLINE_EDITING -#define CONFIG_DOS_PARTITION /* * No NOR diff --git a/include/configs/x600.h b/include/configs/x600.h index f4666a6267..67c70f6e6e 100644 --- a/include/configs/x600.h +++ b/include/configs/x600.h @@ -120,7 +120,6 @@ /* Filesystem support (for USB key) */ #define CONFIG_SUPPORT_VFAT -#define CONFIG_DOS_PARTITION /* diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 04d151bfdc..96659081cc 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -67,19 +67,9 @@ #define CONFIG_SUPPORT_VFAT -/************************************************************ - * DISK Partition support - ************************************************************/ -#define CONFIG_EFI_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_MAC_PARTITION -#define CONFIG_ISO_PARTITION /* Experimental */ - -#define CONFIG_CMD_PART #ifdef CONFIG_SYS_COREBOOT #define CONFIG_CMD_CBFS #endif -#define CONFIG_PARTITION_UUIDS /* x86 GPIOs are accessed through a PCI device */ #define CONFIG_INTEL_ICH6_GPIO diff --git a/include/configs/xfi3.h b/include/configs/xfi3.h index ae9ab71b7a..8e9b5d7077 100644 --- a/include/configs/xfi3.h +++ b/include/configs/xfi3.h @@ -11,7 +11,6 @@ /* U-Boot Commands */ #define CONFIG_SYS_NO_FLASH -#define CONFIG_DOS_PARTITION /* Memory configuration */ #define CONFIG_NR_DRAM_BANKS 1 /* 1 bank of DRAM */ diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 9646dddd2f..4759373e51 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -56,11 +56,6 @@ /* Command line configuration */ #define CONFIG_CMD_ENV -#define CONFIG_DOS_PARTITION -#define CONFIG_EFI_PARTITION -#ifndef CONFIG_SPL_BUILD -# define CONFIG_ISO_PARTITION -#endif #define CONFIG_MP /* BOOTP options */ @@ -80,8 +75,7 @@ #endif #define CONFIG_AUTO_COMPLETE -#if defined(CONFIG_ZYNQ_SDHCI) -# define CONFIG_GENERIC_MMC +#if defined(CONFIG_MMC_SDHCI_ZYNQ) # define CONFIG_SUPPORT_EMMC_BOOT # ifndef CONFIG_ZYNQ_SDHCI_MAX_FREQ # define CONFIG_ZYNQ_SDHCI_MAX_FREQ 200000000 @@ -92,7 +86,7 @@ # define FAT_ENV_INTERFACE "mmc" #endif -#if defined(CONFIG_ZYNQ_SDHCI) || defined(CONFIG_ZYNQMP_USB) +#if defined(CONFIG_MMC_SDHCI_ZYNQ) || defined(CONFIG_ZYNQMP_USB) # define CONFIG_FAT_WRITE #endif @@ -134,11 +128,9 @@ # define CONFIG_FASTBOOT_BUF_ADDR 0x100000 # define CONFIG_FASTBOOT_BUF_SIZE 0x6000000 # define CONFIG_FASTBOOT_FLASH -# ifdef CONFIG_ZYNQ_SDHCI +# ifdef CONFIG_MMC_SDHCI_ZYNQ # define CONFIG_FASTBOOT_FLASH_MMC_DEV 0 # endif -# define CONFIG_PARTITION_UUIDS -# define CONFIG_CMD_GPT # define CONFIG_RANDOM_UUID # define PARTS_DEFAULT \ @@ -229,7 +221,7 @@ "scriptaddr=0x02000000\0" \ "ramdisk_addr_r=0x02100000\0" \ -#if defined(CONFIG_ZYNQ_SDHCI) +#if defined(CONFIG_MMC_SDHCI_ZYNQ) # define BOOT_TARGET_DEVICES_MMC(func) func(MMC, mmc, 0) func(MMC, mmc, 1) #else # define BOOT_TARGET_DEVICES_MMC(func) @@ -297,7 +289,7 @@ #define CONFIG_SPL_LOAD_FIT_ADDRESS 0x10000000 /* MMC support */ -#ifdef CONFIG_ZYNQ_SDHCI +#ifdef CONFIG_MMC_SDHCI_ZYNQ # define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTOR 0 /* unused */ # define CONFIG_SYS_MMCSD_RAW_MODE_ARGS_SECTORS 0 /* unused */ diff --git a/include/configs/xpedite550x.h b/include/configs/xpedite550x.h index 76e3db1706..4ac25a6b21 100644 --- a/include/configs/xpedite550x.h +++ b/include/configs/xpedite550x.h @@ -336,7 +336,6 @@ extern unsigned long get_board_ddr_clk(unsigned long dummy); #define CONFIG_USB_EHCI #define CONFIG_USB_EHCI_FSL #define CONFIG_EHCI_HCD_INIT_AFTER_RESET -#define CONFIG_DOS_PARTITION /* * Command configuration. diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index c77967b1d3..77648d78bc 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -157,9 +157,6 @@ #define CONFIG_PHY1_ADDR 3 /* Partitions */ -#define CONFIG_MAC_PARTITION -#define CONFIG_DOS_PARTITION -#define CONFIG_ISO_PARTITION #ifdef CONFIG_440EP /* USB */ diff --git a/include/configs/zipitz2.h b/include/configs/zipitz2.h index 5ac4f58b28..3df9a078a8 100644 --- a/include/configs/zipitz2.h +++ b/include/configs/zipitz2.h @@ -61,10 +61,8 @@ * MMC Card Configuration */ #ifdef CONFIG_CMD_MMC -#define CONFIG_GENERIC_MMC #define CONFIG_PXA_MMC_GENERIC #define CONFIG_SYS_MMC_BASE 0xF0000000 -#define CONFIG_DOS_PARTITION #endif /* diff --git a/include/configs/zmx25.h b/include/configs/zmx25.h index 4b79f15872..f669590fb7 100644 --- a/include/configs/zmx25.h +++ b/include/configs/zmx25.h @@ -19,6 +19,7 @@ #define CONFIG_SYS_TIMER_COUNTER \ (&((struct gpt_regs *)IMX_GPT1_BASE)->counter) +#define CONFIG_MACH_TYPE MACH_TYPE_ZMX25 /* * Environment settings */ @@ -89,7 +90,6 @@ #define CONFIG_MXC_USB_PORTSC MXC_EHCI_MODE_SERIAL #define CONFIG_MXC_USB_FLAGS (MXC_EHCI_INTERNAL_PHY | MXC_EHCI_IPPUE_DOWN) #define CONFIG_EHCI_IS_TDI -#define CONFIG_DOS_PARTITION #define CONFIG_SUPPORT_VFAT #endif /* CONFIG_CMD_USB */ diff --git a/include/configs/zynq-common.h b/include/configs/zynq-common.h index e0b4bc088c..8e9d3c4213 100644 --- a/include/configs/zynq-common.h +++ b/include/configs/zynq-common.h @@ -83,8 +83,7 @@ #endif /* MMC */ -#if defined(CONFIG_ZYNQ_SDHCI) -# define CONFIG_GENERIC_MMC +#if defined(CONFIG_MMC_SDHCI_ZYNQ) # define CONFIG_ZYNQ_SDHCI_MAX_FREQ 52000000 #endif @@ -106,7 +105,7 @@ "dfu_ram=run dfu_ram_info && dfu 0 ram 0\0" \ "thor_ram=run dfu_ram_info && thordown 0 ram 0\0" -# if defined(CONFIG_ZYNQ_SDHCI) +# if defined(CONFIG_MMC_SDHCI_ZYNQ) # define DFU_ALT_INFO_MMC \ "dfu_mmc_info=" \ "set dfu_alt_info " \ @@ -129,10 +128,9 @@ # define DFU_ALT_INFO #endif -#if defined(CONFIG_ZYNQ_SDHCI) || defined(CONFIG_ZYNQ_USB) +#if defined(CONFIG_MMC_SDHCI_ZYNQ) || defined(CONFIG_ZYNQ_USB) # define CONFIG_SUPPORT_VFAT # define CONFIG_FAT_WRITE -# define CONFIG_DOS_PARTITION #endif #if defined(CONFIG_ZYNQ_I2C0) || defined(CONFIG_ZYNQ_I2C1) @@ -293,7 +291,7 @@ #define CONFIG_SPL_LDSCRIPT "arch/arm/mach-zynq/u-boot-spl.lds" /* MMC support */ -#ifdef CONFIG_ZYNQ_SDHCI +#ifdef CONFIG_MMC_SDHCI_ZYNQ #define CONFIG_SYS_MMCSD_FS_BOOT_PARTITION 1 #define CONFIG_SPL_FS_LOAD_PAYLOAD_NAME "u-boot.img" #endif |