From 1acc0087876229d7ade1b23aaecbccf63de8a615 Mon Sep 17 00:00:00 2001 From: Patrick Delaunay Date: Fri, 27 Jan 2017 11:00:38 +0100 Subject: disk: convert CONFIG_ISO_PARTITION to Kconfig Signed-off-by: Patrick Delaunay Signed-off-by: Patrick Delaunay --- include/config_distro_defaults.h | 1 - include/configs/M52277EVB.h | 1 - include/configs/M54455EVB.h | 1 - include/configs/MIP405.h | 1 - include/configs/PIP405.h | 1 - include/configs/PMC440.h | 1 - include/configs/TQM5200.h | 1 - include/configs/ac14xx.h | 4 ---- include/configs/acadia.h | 1 - include/configs/am335x_shc.h | 3 --- include/configs/aria.h | 4 ---- include/configs/bamboo.h | 1 - include/configs/canyonlands.h | 1 - include/configs/cm5200.h | 1 - include/configs/ds414.h | 1 - include/configs/edminiv2.h | 1 - include/configs/gplugd.h | 1 - include/configs/gr_cpci_ax2000.h | 1 - include/configs/gr_ep2s60.h | 1 - include/configs/gr_xc3s_1500.h | 1 - include/configs/grsim.h | 1 - include/configs/grsim_leon2.h | 1 - include/configs/inka4x0.h | 1 - include/configs/intip.h | 1 - include/configs/jupiter.h | 1 - include/configs/lwmon5.h | 1 - include/configs/mpc5121ads.h | 3 --- include/configs/mv-common.h | 1 - include/configs/mvebu_armada-8k.h | 1 - include/configs/mvebu_db-88f3720.h | 1 - include/configs/o2dnt-common.h | 1 - include/configs/sandbox.h | 1 - include/configs/sequoia.h | 1 - include/configs/vct.h | 2 -- include/configs/x86-common.h | 1 - include/configs/xilinx_zynqmp.h | 3 --- include/configs/yosemite.h | 1 - 37 files changed, 50 deletions(-) (limited to 'include') diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index 4ed4570..c96d258 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -24,7 +24,6 @@ #define CONFIG_AUTO_COMPLETE #define CONFIG_SYS_LONGHELP #define CONFIG_EFI_PARTITION -#define CONFIG_ISO_PARTITION #define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_ENV_VARS_UBOOT_CONFIG diff --git a/include/configs/M52277EVB.h b/include/configs/M52277EVB.h index 11c41cd..98ccbe3 100644 --- a/include/configs/M52277EVB.h +++ b/include/configs/M52277EVB.h @@ -92,7 +92,6 @@ /* USB */ #ifdef CONFIG_CMD_USB #define CONFIG_USB_EHCI -#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/M54455EVB.h b/include/configs/M54455EVB.h index 825dbce..0eed59e 100644 --- a/include/configs/M54455EVB.h +++ b/include/configs/M54455EVB.h @@ -119,7 +119,6 @@ #endif /* ATA configuration */ -#define CONFIG_ISO_PARTITION #define CONFIG_IDE_RESET 1 #define CONFIG_IDE_PREINIT 1 #define CONFIG_ATAPI diff --git a/include/configs/MIP405.h b/include/configs/MIP405.h index 50c98df..b59c53e 100644 --- a/include/configs/MIP405.h +++ b/include/configs/MIP405.h @@ -326,7 +326,6 @@ /************************************************************ * DISK Partition support ************************************************************/ -#define CONFIG_ISO_PARTITION /* Experimental */ /************************************************************ * Video support diff --git a/include/configs/PIP405.h b/include/configs/PIP405.h index b22f9e4..ab7ac2b 100644 --- a/include/configs/PIP405.h +++ b/include/configs/PIP405.h @@ -284,7 +284,6 @@ /************************************************************ * DISK Partition support ************************************************************/ -#define CONFIG_ISO_PARTITION /* Experimental */ /************************************************************ * Video support diff --git a/include/configs/PMC440.h b/include/configs/PMC440.h index 06422b5..5ea82f8 100644 --- a/include/configs/PMC440.h +++ b/include/configs/PMC440.h @@ -258,7 +258,6 @@ #define USB_2_0_DEVICE /* Partitions */ -#define CONFIG_ISO_PARTITION #define CONFIG_CMD_BSP #define CONFIG_CMD_DATE diff --git a/include/configs/TQM5200.h b/include/configs/TQM5200.h index e1379bb..495fdc8 100644 --- a/include/configs/TQM5200.h +++ b/include/configs/TQM5200.h @@ -107,7 +107,6 @@ #endif /* #ifndef CONFIG_TQM5200S */ /* Partitions */ -#define CONFIG_ISO_PARTITION /* USB */ #if defined(CONFIG_CHARON) || defined(CONFIG_FO300) || \ diff --git a/include/configs/ac14xx.h b/include/configs/ac14xx.h index bcbc159..a7a6bfe 100644 --- a/include/configs/ac14xx.h +++ b/include/configs/ac14xx.h @@ -396,10 +396,6 @@ #define CONFIG_CMD_PCI #endif -#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2) -#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 b9ddbde..9f35e71 100644 --- a/include/configs/acadia.h +++ b/include/configs/acadia.h @@ -154,7 +154,6 @@ #define CONFIG_USB_OHCI /* Partitions */ -#define CONFIG_ISO_PARTITION #define CONFIG_SUPPORT_VFAT diff --git a/include/configs/am335x_shc.h b/include/configs/am335x_shc.h index d780c3f..e4b4cea 100644 --- a/include/configs/am335x_shc.h +++ b/include/configs/am335x_shc.h @@ -83,9 +83,6 @@ /* 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/aria.h b/include/configs/aria.h index 8e3a7b2..d408d54 100644 --- a/include/configs/aria.h +++ b/include/configs/aria.h @@ -403,10 +403,6 @@ #define CONFIG_CMD_PCI #endif -#if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2) -#define CONFIG_ISO_PARTITION -#endif /* defined(CONFIG_CMD_IDE) */ - /* * Dynamic MTD partition support */ diff --git a/include/configs/bamboo.h b/include/configs/bamboo.h index 704310c..aeb6507 100644 --- a/include/configs/bamboo.h +++ b/include/configs/bamboo.h @@ -192,7 +192,6 @@ #define CONFIG_SUPPORT_VFAT /* Partitions */ -#define CONFIG_ISO_PARTITION /*----------------------------------------------------------------------- * PCI stuff diff --git a/include/configs/canyonlands.h b/include/configs/canyonlands.h index f463bd6..9babc3d 100644 --- a/include/configs/canyonlands.h +++ b/include/configs/canyonlands.h @@ -395,7 +395,6 @@ #endif /* Partitions */ -#define CONFIG_ISO_PARTITION /*----------------------------------------------------------------------- * PCI stuff diff --git a/include/configs/cm5200.h b/include/configs/cm5200.h index c454b17..b3a98df 100644 --- a/include/configs/cm5200.h +++ b/include/configs/cm5200.h @@ -225,7 +225,6 @@ #define CONFIG_USB_CLOCK 0x0001BBBB #define CONFIG_USB_CONFIG 0x00001000 /* Partitions (for USB) */ -#define CONFIG_ISO_PARTITION 1 /* * Invoke our last_stage_init function - needed by fwupdate diff --git a/include/configs/ds414.h b/include/configs/ds414.h index b396c9c..9d5a5f7 100644 --- a/include/configs/ds414.h +++ b/include/configs/ds414.h @@ -81,7 +81,6 @@ #endif /* why is this only defined in mv-common.h if CONFIG_DM is undefined? */ -#define CONFIG_ISO_PARTITION #define CONFIG_SUPPORT_VFAT #define CONFIG_SYS_MVFS diff --git a/include/configs/edminiv2.h b/include/configs/edminiv2.h index c861c32..175adbd 100644 --- a/include/configs/edminiv2.h +++ b/include/configs/edminiv2.h @@ -175,7 +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_ISO_PARTITION #define CONFIG_SUPPORT_VFAT #endif /* CONFIG_CMD_USB */ diff --git a/include/configs/gplugd.h b/include/configs/gplugd.h index f53064f..7f84f7f 100644 --- a/include/configs/gplugd.h +++ b/include/configs/gplugd.h @@ -98,7 +98,6 @@ #define CONFIG_EHCI_IS_TDI #endif /* CONFIG_CMD_USB */ -#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 e3871c3..7f6586f 100644 --- a/include/configs/gr_cpci_ax2000.h +++ b/include/configs/gr_cpci_ax2000.h @@ -49,7 +49,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ -#define CONFIG_ISO_PARTITION /* * Supported commands diff --git a/include/configs/gr_ep2s60.h b/include/configs/gr_ep2s60.h index 56457bf..4d28a97 100644 --- a/include/configs/gr_ep2s60.h +++ b/include/configs/gr_ep2s60.h @@ -43,7 +43,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ -#define CONFIG_ISO_PARTITION /* * Supported commands diff --git a/include/configs/gr_xc3s_1500.h b/include/configs/gr_xc3s_1500.h index 17ec8db..b91ab85 100644 --- a/include/configs/gr_xc3s_1500.h +++ b/include/configs/gr_xc3s_1500.h @@ -30,7 +30,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ -#define CONFIG_ISO_PARTITION /* * Supported commands diff --git a/include/configs/grsim.h b/include/configs/grsim.h index d7aa67e..8c1c8b4 100644 --- a/include/configs/grsim.h +++ b/include/configs/grsim.h @@ -41,7 +41,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ -#define CONFIG_ISO_PARTITION /* * Supported commands diff --git a/include/configs/grsim_leon2.h b/include/configs/grsim_leon2.h index 6480492..3651017 100644 --- a/include/configs/grsim_leon2.h +++ b/include/configs/grsim_leon2.h @@ -36,7 +36,6 @@ #define CONFIG_SYS_BAUDRATE_TABLE { 9600, 19200, 38400, 57600, 115200, 230400 } /* Partitions */ -#define CONFIG_ISO_PARTITION /* * Supported commands diff --git a/include/configs/inka4x0.h b/include/configs/inka4x0.h index 49cd228..b2131e8 100644 --- a/include/configs/inka4x0.h +++ b/include/configs/inka4x0.h @@ -61,7 +61,6 @@ #define CONFIG_SYS_XLB_PIPELINING 1 /* Partitions */ -#define CONFIG_ISO_PARTITION /* * BOOTP options diff --git a/include/configs/intip.h b/include/configs/intip.h index 98b9f41..3477059 100644 --- a/include/configs/intip.h +++ b/include/configs/intip.h @@ -279,7 +279,6 @@ #define CONFIG_CMD_SDRAM /* Partitions */ -#define CONFIG_ISO_PARTITION /* * PCI stuff diff --git a/include/configs/jupiter.h b/include/configs/jupiter.h index ea2f465..44345dd 100644 --- a/include/configs/jupiter.h +++ b/include/configs/jupiter.h @@ -63,7 +63,6 @@ #define CONFIG_SYS_RX_ETH_BUFFER 8 /* use 8 rx buffer on eepro100 */ /* Partitions */ -#define CONFIG_ISO_PARTITION #define CONFIG_TIMESTAMP /* Print image info with timestamp */ diff --git a/include/configs/lwmon5.h b/include/configs/lwmon5.h index 0202e42..9bca8ac 100644 --- a/include/configs/lwmon5.h +++ b/include/configs/lwmon5.h @@ -371,7 +371,6 @@ #define CONFIG_EHCI_HCD_INIT_AFTER_RESET /* re-init HCD after CMD_RESET */ /* Partitions */ -#define CONFIG_ISO_PARTITION /* * BOOTP options diff --git a/include/configs/mpc5121ads.h b/include/configs/mpc5121ads.h index e5a6db8..fe9a703 100644 --- a/include/configs/mpc5121ads.h +++ b/include/configs/mpc5121ads.h @@ -437,9 +437,6 @@ "mpc5121.nand:-(data)" #if defined(CONFIG_CMD_IDE) || defined(CONFIG_CMD_EXT2) || defined(CONFIG_CMD_USB) - -#define CONFIG_ISO_PARTITION - #define CONFIG_SUPPORT_VFAT #endif /* defined(CONFIG_CMD_IDE) */ diff --git a/include/configs/mv-common.h b/include/configs/mv-common.h index 69eca23..25562fa 100644 --- a/include/configs/mv-common.h +++ b/include/configs/mv-common.h @@ -123,7 +123,6 @@ */ #if defined(CONFIG_CMD_USB) && !defined(CONFIG_DM) #define CONFIG_USB_EHCI /* Enable EHCI USB support */ -#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 087b186..44395bf 100644 --- a/include/configs/mvebu_armada-8k.h +++ b/include/configs/mvebu_armada-8k.h @@ -121,7 +121,6 @@ /* DISK Partition support */ #define CONFIG_EFI_PARTITION -#define CONFIG_ISO_PARTITION /* Experimental */ #define CONFIG_CMD_PART #define CONFIG_PARTITION_UUIDS diff --git a/include/configs/mvebu_db-88f3720.h b/include/configs/mvebu_db-88f3720.h index 9b2893f..868e63e 100644 --- a/include/configs/mvebu_db-88f3720.h +++ b/include/configs/mvebu_db-88f3720.h @@ -133,7 +133,6 @@ /* DISK Partition support */ #define CONFIG_EFI_PARTITION -#define CONFIG_ISO_PARTITION /* Experimental */ #define CONFIG_CMD_PART #define CONFIG_PARTITION_UUIDS diff --git a/include/configs/o2dnt-common.h b/include/configs/o2dnt-common.h index 1152618..8a414c3 100644 --- a/include/configs/o2dnt-common.h +++ b/include/configs/o2dnt-common.h @@ -61,7 +61,6 @@ #define CONFIG_SYS_XLB_PIPELINING 1 /* Partitions */ -#define CONFIG_ISO_PARTITION #define CONFIG_TIMESTAMP /* Print image info with timestamp */ diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h index 72cd362..2591887 100644 --- a/include/configs/sandbox.h +++ b/include/configs/sandbox.h @@ -51,7 +51,6 @@ #define CONFIG_PARTITION_UUIDS #define CONFIG_AMIGA_PARTITION #define CONFIG_EFI_PARTITION -#define CONFIG_ISO_PARTITION /* * Size of malloc() pool, before and after relocation diff --git a/include/configs/sequoia.h b/include/configs/sequoia.h index 169778f..572e6b1 100644 --- a/include/configs/sequoia.h +++ b/include/configs/sequoia.h @@ -218,7 +218,6 @@ #endif /* CONFIG_440EPX */ /* Partitions */ -#define CONFIG_ISO_PARTITION /* * Commands additional to the ones defined in amcc-common.h diff --git a/include/configs/vct.h b/include/configs/vct.h index c10e77f..22f170c 100644 --- a/include/configs/vct.h +++ b/include/configs/vct.h @@ -97,8 +97,6 @@ #endif #if defined(CONFIG_CMD_USB) -#define CONFIG_ISO_PARTITION - #define CONFIG_SUPPORT_VFAT /* diff --git a/include/configs/x86-common.h b/include/configs/x86-common.h index 0134331..8db798d 100644 --- a/include/configs/x86-common.h +++ b/include/configs/x86-common.h @@ -71,7 +71,6 @@ * DISK Partition support ************************************************************/ #define CONFIG_EFI_PARTITION -#define CONFIG_ISO_PARTITION /* Experimental */ #define CONFIG_CMD_PART #ifdef CONFIG_SYS_COREBOOT diff --git a/include/configs/xilinx_zynqmp.h b/include/configs/xilinx_zynqmp.h index 5578840..463e9a6 100644 --- a/include/configs/xilinx_zynqmp.h +++ b/include/configs/xilinx_zynqmp.h @@ -57,9 +57,6 @@ /* Command line configuration */ #define CONFIG_CMD_ENV #define CONFIG_EFI_PARTITION -#ifndef CONFIG_SPL_BUILD -# define CONFIG_ISO_PARTITION -#endif #define CONFIG_MP /* BOOTP options */ diff --git a/include/configs/yosemite.h b/include/configs/yosemite.h index d743a32..77648d7 100644 --- a/include/configs/yosemite.h +++ b/include/configs/yosemite.h @@ -157,7 +157,6 @@ #define CONFIG_PHY1_ADDR 3 /* Partitions */ -#define CONFIG_ISO_PARTITION #ifdef CONFIG_440EP /* USB */ -- cgit v1.1