Skip to content
Snippets Groups Projects
Commit 1acc0087 authored by Patrick Delaunay's avatar Patrick Delaunay Committed by Tom Rini
Browse files

disk: convert CONFIG_ISO_PARTITION to Kconfig

parent b0cf7339
No related branches found
No related tags found
No related merge requests found
Showing
with 21 additions and 2 deletions
...@@ -321,7 +321,7 @@ void efi_set_bootdev(const char *dev, const char *devnr, const char *path) ...@@ -321,7 +321,7 @@ void efi_set_bootdev(const char *dev, const char *devnr, const char *path)
char devname[32] = { 0 }; /* dp->str is u16[32] long */ char devname[32] = { 0 }; /* dp->str is u16[32] long */
char *colon; char *colon;
#if defined(CONFIG_BLK) || defined(CONFIG_ISO_PARTITION) #if defined(CONFIG_BLK) || CONFIG_IS_ENABLED(ISO_PARTITION)
desc = blk_get_dev(dev, simple_strtol(devnr, NULL, 10)); desc = blk_get_dev(dev, simple_strtol(devnr, NULL, 10));
#endif #endif
...@@ -338,7 +338,7 @@ void efi_set_bootdev(const char *dev, const char *devnr, const char *path) ...@@ -338,7 +338,7 @@ void efi_set_bootdev(const char *dev, const char *devnr, const char *path)
colon = strchr(devname, ':'); colon = strchr(devname, ':');
#ifdef CONFIG_ISO_PARTITION #if CONFIG_IS_ENABLED(ISO_PARTITION)
/* For ISOs we create partition block devices */ /* For ISOs we create partition block devices */
if (desc && (desc->type != DEV_TYPE_UNKNOWN) && if (desc && (desc->type != DEV_TYPE_UNKNOWN) &&
(desc->part_type == PART_TYPE_ISO)) { (desc->part_type == PART_TYPE_ISO)) {
......
...@@ -15,6 +15,7 @@ CONFIG_SPL=y ...@@ -15,6 +15,7 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_AXP_ALDO3_VOLT=2800 CONFIG_AXP_ALDO3_VOLT=2800
CONFIG_AXP_ALDO4_VOLT=2800 CONFIG_AXP_ALDO4_VOLT=2800
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
...@@ -15,5 +15,6 @@ CONFIG_SPL=y ...@@ -15,5 +15,6 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_AXP152_POWER=y CONFIG_AXP152_POWER=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
...@@ -18,5 +18,6 @@ CONFIG_SPL=y ...@@ -18,5 +18,6 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_SUNXI_NO_PMIC=y CONFIG_SUNXI_NO_PMIC=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
...@@ -23,6 +23,7 @@ CONFIG_CMD_DFU=y ...@@ -23,6 +23,7 @@ CONFIG_CMD_DFU=y
CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_USB_MASS_STORAGE=y
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_DFU_RAM=y CONFIG_DFU_RAM=y
CONFIG_AXP_ALDO3_VOLT=3300 CONFIG_AXP_ALDO3_VOLT=3300
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
......
...@@ -17,6 +17,7 @@ CONFIG_CMD_DFU=y ...@@ -17,6 +17,7 @@ CONFIG_CMD_DFU=y
CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_USB_MASS_STORAGE=y
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_DFU_RAM=y CONFIG_DFU_RAM=y
CONFIG_RTL8211X_PHY_FORCE_MASTER=y CONFIG_RTL8211X_PHY_FORCE_MASTER=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y
......
...@@ -13,6 +13,7 @@ CONFIG_SPL=y ...@@ -13,6 +13,7 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP_ALDO3_VOLT=2800 CONFIG_AXP_ALDO3_VOLT=2800
CONFIG_AXP_ALDO4_VOLT=2800 CONFIG_AXP_ALDO4_VOLT=2800
......
...@@ -16,6 +16,7 @@ CONFIG_SPL=y ...@@ -16,6 +16,7 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP_ALDO3_VOLT=2800 CONFIG_AXP_ALDO3_VOLT=2800
CONFIG_AXP_ALDO4_VOLT=2800 CONFIG_AXP_ALDO4_VOLT=2800
......
...@@ -18,6 +18,7 @@ CONFIG_SPL=y ...@@ -18,6 +18,7 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_RTL8211X_PHY_FORCE_MASTER=y CONFIG_RTL8211X_PHY_FORCE_MASTER=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP_ALDO3_VOLT=2800 CONFIG_AXP_ALDO3_VOLT=2800
......
...@@ -20,5 +20,6 @@ CONFIG_SPL=y ...@@ -20,5 +20,6 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_AXP_DCDC1_VOLT=3300 CONFIG_AXP_DCDC1_VOLT=3300
CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_HOST=y
...@@ -19,4 +19,5 @@ CONFIG_SPL=y ...@@ -19,4 +19,5 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_HOST=y
...@@ -21,4 +21,5 @@ CONFIG_SPL=y ...@@ -21,4 +21,5 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_HOST=y
...@@ -13,5 +13,6 @@ CONFIG_SPL=y ...@@ -13,5 +13,6 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_AXP152_POWER=y CONFIG_AXP152_POWER=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
...@@ -11,5 +11,6 @@ CONFIG_SPL=y ...@@ -11,5 +11,6 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_AXP152_POWER=y CONFIG_AXP152_POWER=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
...@@ -14,6 +14,7 @@ CONFIG_SPL=y ...@@ -14,6 +14,7 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
...@@ -16,6 +16,7 @@ CONFIG_SPL=y ...@@ -16,6 +16,7 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_NETCONSOLE=y CONFIG_NETCONSOLE=y
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP_ALDO4_VOLT=2500 CONFIG_AXP_ALDO4_VOLT=2500
......
...@@ -14,6 +14,7 @@ CONFIG_SPL=y ...@@ -14,6 +14,7 @@ CONFIG_SPL=y
CONFIG_CMD_DFU=y CONFIG_CMD_DFU=y
CONFIG_CMD_USB_MASS_STORAGE=y CONFIG_CMD_USB_MASS_STORAGE=y
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_DFU_RAM=y CONFIG_DFU_RAM=y
CONFIG_AXP_ALDO3_VOLT=3300 CONFIG_AXP_ALDO3_VOLT=3300
CONFIG_AXP_ALDO4_VOLT=3300 CONFIG_AXP_ALDO4_VOLT=3300
......
...@@ -12,6 +12,7 @@ CONFIG_SPL=y ...@@ -12,6 +12,7 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP_ALDO1_VOLT=3300 CONFIG_AXP_ALDO1_VOLT=3300
CONFIG_AXP_DLDO1_VOLT=3300 CONFIG_AXP_DLDO1_VOLT=3300
......
...@@ -19,6 +19,7 @@ CONFIG_SPL=y ...@@ -19,6 +19,7 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_USB_MUSB_HOST=y CONFIG_USB_MUSB_HOST=y
CONFIG_VIDEO_LCD_SPI_CS="PA0" CONFIG_VIDEO_LCD_SPI_CS="PA0"
CONFIG_VIDEO_LCD_SPI_SCLK="PA1" CONFIG_VIDEO_LCD_SPI_SCLK="PA1"
......
...@@ -22,6 +22,7 @@ CONFIG_SPL=y ...@@ -22,6 +22,7 @@ CONFIG_SPL=y
# CONFIG_CMD_FLASH is not set # CONFIG_CMD_FLASH is not set
# CONFIG_CMD_FPGA is not set # CONFIG_CMD_FPGA is not set
# CONFIG_SPL_DOS_PARTITION is not set # CONFIG_SPL_DOS_PARTITION is not set
# CONFIG_SPL_ISO_PARTITION is not set
CONFIG_ETH_DESIGNWARE=y CONFIG_ETH_DESIGNWARE=y
CONFIG_AXP_ALDO1_VOLT=3300 CONFIG_AXP_ALDO1_VOLT=3300
CONFIG_USB_EHCI_HCD=y CONFIG_USB_EHCI_HCD=y
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment