| Message ID | 1496837766-20262-1-git-send-email-igall@marvell.com |
|---|---|
| State | Superseded |
| Delegated to: | Stefan Roese |
| Headers | show |
Hi Igal, On 07.06.2017 14:16, igall@marvell.com wrote: > From: Igal Liberman <igall@marvell.com> > > Currently, Marvell Armada8k development board use 3 different > defconfigs: > mvebu_db-88f7040-nand_defconfig > mvebu_db-88f7040_defconfig > mvebu_db-88f8040_defconfig > Having 3 different defconfigs makes maintenance difficult. > > This patch removes the defconfigs mentioned above and introduce > a new defconfig which represents the Armada8k family. > > With this patch, no device-tree is set in the defconfig, so the > device-tree should be set during compilation, using: > > Configure u-boot: > > make mvebu_db_armada8k_defconfig > > Select the desired device-tree during compilation: > > make DEVICE_TREE=armada-7040-db > make DEVICE_TREE=armada-8040-db > make DEVICE_TREE=armada-7040-db-nand I like the idea to consolidate the defconfigs in general. One question though. This patch results in one build target for the automated tests (Travis). Does compiling without the additional DEVICE_TREE= work without generating compilation errors? Otherwise the Travis tests will fail. Thanks, Stefan
Hi Stefan Regards, Igal > -----Original Message----- > From: Stefan Roese [mailto:sr@denx.de] > Sent: Thursday, June 08, 2017 08:38 > To: Igal Liberman; u-boot@lists.denx.de > Cc: Kostya Porotchkin; Nadav Haklai; Neta Zur Hershkovits > Subject: Re: [PATCH] arm64: mvebu: use single defconfig for Armada8K > development boards > > Hi Igal, > > On 07.06.2017 14:16, igall@marvell.com wrote: > > From: Igal Liberman <igall@marvell.com> > > > > Currently, Marvell Armada8k development board use 3 different > > defconfigs: > > mvebu_db-88f7040-nand_defconfig > > mvebu_db-88f7040_defconfig > > mvebu_db-88f8040_defconfig > > Having 3 different defconfigs makes maintenance difficult. > > > > This patch removes the defconfigs mentioned above and introduce a new > > defconfig which represents the Armada8k family. > > > > With this patch, no device-tree is set in the defconfig, so the > > device-tree should be set during compilation, using: > > > > Configure u-boot: > > > > make mvebu_db_armada8k_defconfig > > > > Select the desired device-tree during compilation: > > > > make DEVICE_TREE=armada-7040-db > > make DEVICE_TREE=armada-8040-db > > make DEVICE_TREE=armada-7040-db-nand > > I like the idea to consolidate the defconfigs in general. One question though. > This patch results in one build target for the automated tests (Travis). Does > compiling without the additional DEVICE_TREE= work without generating > compilation errors? Otherwise the Travis tests will fail. > If you compile without DEVICE_TREE= it won't compile (unless you exported DEVICE_TREE before). Basically, I did it on purpose - to make sure that user doesn't rely on some possible incorrect default settings. If it causes a compilation issues for the automated tests - I guess we can set a default value after all. What do you think? > Thanks, > Stefan
Hi Igal, On 08.06.2017 08:06, Igal Liberman wrote: >> On 07.06.2017 14:16, igall@marvell.com wrote: >>> From: Igal Liberman <igall@marvell.com> >>> >>> Currently, Marvell Armada8k development board use 3 different >>> defconfigs: >>> mvebu_db-88f7040-nand_defconfig >>> mvebu_db-88f7040_defconfig >>> mvebu_db-88f8040_defconfig >>> Having 3 different defconfigs makes maintenance difficult. >>> >>> This patch removes the defconfigs mentioned above and introduce a new >>> defconfig which represents the Armada8k family. >>> >>> With this patch, no device-tree is set in the defconfig, so the >>> device-tree should be set during compilation, using: >>> >>> Configure u-boot: >>> >>> make mvebu_db_armada8k_defconfig >>> >>> Select the desired device-tree during compilation: >>> >>> make DEVICE_TREE=armada-7040-db >>> make DEVICE_TREE=armada-8040-db >>> make DEVICE_TREE=armada-7040-db-nand >> >> I like the idea to consolidate the defconfigs in general. One question though. >> This patch results in one build target for the automated tests (Travis). Does >> compiling without the additional DEVICE_TREE= work without generating >> compilation errors? Otherwise the Travis tests will fail. >> > > If you compile without DEVICE_TREE= it won't compile (unless you exported > DEVICE_TREE before). > Basically, I did it on purpose - to make sure that user doesn't rely on > some possible incorrect default settings. Makes sense. > If it causes a compilation issues for the automated tests - I guess we can > set a default value after all. > What do you think? Yes, please do. We need to compile clean for the automated tests, otherwise this patch simply can't be accepted (sorry). Thanks, Stefan
Hi Stefan Regards, Igal > -----Original Message----- > From: Stefan Roese [mailto:sr@denx.de] > Sent: Thursday, June 08, 2017 09:10 > To: Igal Liberman; u-boot@lists.denx.de > Cc: Kostya Porotchkin; Nadav Haklai; Neta Zur Hershkovits > Subject: Re: [PATCH] arm64: mvebu: use single defconfig for Armada8K > development boards > > Hi Igal, > > On 08.06.2017 08:06, Igal Liberman wrote: > >> On 07.06.2017 14:16, igall@marvell.com wrote: > >>> From: Igal Liberman <igall@marvell.com> > >>> > >>> Currently, Marvell Armada8k development board use 3 different > >>> defconfigs: > >>> mvebu_db-88f7040-nand_defconfig > >>> mvebu_db-88f7040_defconfig > >>> mvebu_db-88f8040_defconfig Having 3 different defconfigs > >>> makes maintenance difficult. > >>> > >>> This patch removes the defconfigs mentioned above and introduce a > >>> new defconfig which represents the Armada8k family. > >>> > >>> With this patch, no device-tree is set in the defconfig, so the > >>> device-tree should be set during compilation, using: > >>> > >>> Configure u-boot: > >>> > >>> make mvebu_db_armada8k_defconfig > >>> > >>> Select the desired device-tree during compilation: > >>> > >>> make DEVICE_TREE=armada-7040-db > >>> make DEVICE_TREE=armada-8040-db > >>> make DEVICE_TREE=armada-7040-db-nand > >> > >> I like the idea to consolidate the defconfigs in general. One question > though. > >> This patch results in one build target for the automated tests > >> (Travis). Does compiling without the additional DEVICE_TREE= work > >> without generating compilation errors? Otherwise the Travis tests will fail. > >> > > > > If you compile without DEVICE_TREE= it won't compile (unless you > > exported DEVICE_TREE before). > > Basically, I did it on purpose - to make sure that user doesn't rely > > on some possible incorrect default settings. > > Makes sense. > > > If it causes a compilation issues for the automated tests - I guess we > > can set a default value after all. > > What do you think? > > Yes, please do. We need to compile clean for the automated tests, otherwise > this patch simply can't be accepted (sorry). > I'll submit a new patch with default device-tree. Thank you for the review. > Thanks, > Stefan
diff --git a/configs/mvebu_db-88f7040-nand_defconfig b/configs/mvebu_db-88f7040-nand_defconfig deleted file mode 100644 index 8d48cb6..0000000 --- a/configs/mvebu_db-88f7040-nand_defconfig +++ /dev/null @@ -1,72 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_MVEBU=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_TARGET_MVEBU_ARMADA_8K=y -CONFIG_DEFAULT_DEVICE_TREE="armada-7040-db-nand" -CONFIG_SMBIOS_PRODUCT_NAME="" -CONFIG_AHCI=y -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_CPUINFO is not set -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_ARCH_EARLY_INIT_R=y -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_HUSH_PARSER=y -# CONFIG_CMD_IMLS is not set -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_MMC=y -CONFIG_CMD_NAND=y -CONFIG_CMD_PART=y -CONFIG_CMD_SF=y -CONFIG_CMD_SPI=y -CONFIG_CMD_I2C=y -CONFIG_CMD_USB=y -# CONFIG_CMD_FPGA is not set -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_TFTPPUT=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_TIME=y -CONFIG_CMD_MVEBU_BUBT=y -CONFIG_MVEBU_NAND_BOOT=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_MAC_PARTITION=y -CONFIG_ISO_PARTITION=y -CONFIG_EFI_PARTITION=y -CONFIG_BLOCK_CACHE=y -CONFIG_DM_I2C=y -CONFIG_SYS_I2C_MVTWSI=y -CONFIG_MISC=y -CONFIG_DM_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_XENON=y -CONFIG_NAND_PXA3XX=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_SPI_FLASH_SPANSION=y -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_PHYLIB=y -CONFIG_PCI=y -CONFIG_DM_PCI=y -CONFIG_PCIE_DW_MVEBU=y -CONFIG_MVEBU_COMPHY_SUPPORT=y -CONFIG_PINCTRL=y -CONFIG_PINCTRL_ARMADA_8K=y -# CONFIG_SPL_SERIAL_PRESENT is not set -CONFIG_DEBUG_UART=y -CONFIG_DEBUG_UART_BASE=0xf0512000 -CONFIG_DEBUG_UART_CLOCK=200000000 -CONFIG_DEBUG_UART_SHIFT=2 -CONFIG_DEBUG_UART_ANNOUNCE=y -CONFIG_SYS_NS16550=y -CONFIG_USB=y -CONFIG_DM_USB=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_SMBIOS_MANUFACTURER="" diff --git a/configs/mvebu_db-88f7040_defconfig b/configs/mvebu_db-88f7040_defconfig deleted file mode 100644 index 9f7b2c4..0000000 --- a/configs/mvebu_db-88f7040_defconfig +++ /dev/null @@ -1,70 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_MVEBU=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_TARGET_MVEBU_ARMADA_8K=y -CONFIG_DEFAULT_DEVICE_TREE="armada-7040-db" -CONFIG_SMBIOS_PRODUCT_NAME="" -CONFIG_AHCI=y -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_CPUINFO is not set -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_ARCH_EARLY_INIT_R=y -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_HUSH_PARSER=y -# CONFIG_CMD_IMLS is not set -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_MMC=y -CONFIG_CMD_PART=y -CONFIG_CMD_SF=y -CONFIG_CMD_SPI=y -CONFIG_CMD_I2C=y -CONFIG_CMD_USB=y -# CONFIG_CMD_FPGA is not set -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_TFTPPUT=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_TIME=y -CONFIG_CMD_MVEBU_BUBT=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_MAC_PARTITION=y -CONFIG_ISO_PARTITION=y -CONFIG_EFI_PARTITION=y -CONFIG_BLOCK_CACHE=y -CONFIG_DM_I2C=y -CONFIG_SYS_I2C_MVTWSI=y -CONFIG_MISC=y -CONFIG_DM_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_XENON=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_SPI_FLASH_SPANSION=y -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_PHY_MARVELL=y -CONFIG_MVPP2=y -CONFIG_PCI=y -CONFIG_DM_PCI=y -CONFIG_PCIE_DW_MVEBU=y -CONFIG_MVEBU_COMPHY_SUPPORT=y -CONFIG_PINCTRL=y -CONFIG_PINCTRL_ARMADA_8K=y -# CONFIG_SPL_SERIAL_PRESENT is not set -CONFIG_DEBUG_UART=y -CONFIG_DEBUG_UART_BASE=0xf0512000 -CONFIG_DEBUG_UART_CLOCK=200000000 -CONFIG_DEBUG_UART_SHIFT=2 -CONFIG_DEBUG_UART_ANNOUNCE=y -CONFIG_SYS_NS16550=y -CONFIG_USB=y -CONFIG_DM_USB=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_SMBIOS_MANUFACTURER="" diff --git a/configs/mvebu_db-88f8040_defconfig b/configs/mvebu_db-88f8040_defconfig deleted file mode 100644 index c21c977..0000000 --- a/configs/mvebu_db-88f8040_defconfig +++ /dev/null @@ -1,70 +0,0 @@ -CONFIG_ARM=y -CONFIG_ARCH_MVEBU=y -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_TARGET_MVEBU_ARMADA_8K=y -CONFIG_DEFAULT_DEVICE_TREE="armada-8040-db" -CONFIG_SMBIOS_PRODUCT_NAME="" -CONFIG_AHCI=y -# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set -CONFIG_SYS_CONSOLE_INFO_QUIET=y -# CONFIG_DISPLAY_CPUINFO is not set -# CONFIG_DISPLAY_BOARDINFO is not set -CONFIG_ARCH_EARLY_INIT_R=y -CONFIG_BOARD_EARLY_INIT_F=y -CONFIG_HUSH_PARSER=y -# CONFIG_CMD_IMLS is not set -# CONFIG_CMD_FLASH is not set -CONFIG_CMD_MMC=y -CONFIG_CMD_PART=y -CONFIG_CMD_SF=y -CONFIG_CMD_SPI=y -CONFIG_CMD_I2C=y -CONFIG_CMD_USB=y -# CONFIG_CMD_FPGA is not set -# CONFIG_CMD_SETEXPR is not set -CONFIG_CMD_TFTPPUT=y -CONFIG_CMD_DHCP=y -CONFIG_CMD_MII=y -CONFIG_CMD_PING=y -CONFIG_CMD_CACHE=y -CONFIG_CMD_TIME=y -CONFIG_CMD_MVEBU_BUBT=y -CONFIG_CMD_EXT4=y -CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_FAT=y -CONFIG_CMD_FS_GENERIC=y -CONFIG_MAC_PARTITION=y -CONFIG_ISO_PARTITION=y -CONFIG_EFI_PARTITION=y -CONFIG_BLOCK_CACHE=y -CONFIG_DM_I2C=y -CONFIG_SYS_I2C_MVTWSI=y -CONFIG_MISC=y -CONFIG_DM_MMC=y -CONFIG_MMC_SDHCI=y -CONFIG_MMC_SDHCI_XENON=y -CONFIG_SPI_FLASH=y -CONFIG_SPI_FLASH_MACRONIX=y -CONFIG_SPI_FLASH_SPANSION=y -CONFIG_SPI_FLASH_STMICRO=y -CONFIG_PHY_MARVELL=y -CONFIG_MVPP2=y -CONFIG_PCI=y -CONFIG_DM_PCI=y -CONFIG_PCIE_DW_MVEBU=y -CONFIG_MVEBU_COMPHY_SUPPORT=y -CONFIG_PINCTRL=y -CONFIG_PINCTRL_ARMADA_8K=y -# CONFIG_SPL_SERIAL_PRESENT is not set -CONFIG_DEBUG_UART=y -CONFIG_DEBUG_UART_BASE=0xf0512000 -CONFIG_DEBUG_UART_CLOCK=200000000 -CONFIG_DEBUG_UART_SHIFT=2 -CONFIG_DEBUG_UART_ANNOUNCE=y -CONFIG_SYS_NS16550=y -CONFIG_USB=y -CONFIG_DM_USB=y -CONFIG_USB_XHCI_HCD=y -CONFIG_USB_EHCI_HCD=y -CONFIG_USB_STORAGE=y -CONFIG_SMBIOS_MANUFACTURER="" diff --git a/configs/mvebu_db_armada8k_defconfig b/configs/mvebu_db_armada8k_defconfig new file mode 100644 index 0000000..bee3ae5 --- /dev/null +++ b/configs/mvebu_db_armada8k_defconfig @@ -0,0 +1,69 @@ +CONFIG_ARM=y +CONFIG_ARCH_MVEBU=y +CONFIG_SYS_MALLOC_F_LEN=0x2000 +CONFIG_TARGET_MVEBU_ARMADA_8K=y +CONFIG_SMBIOS_PRODUCT_NAME="" +CONFIG_DEBUG_UART=y +CONFIG_AHCI=y +# CONFIG_SYS_MALLOC_CLEAR_ON_INIT is not set +CONFIG_SYS_CONSOLE_INFO_QUIET=y +# CONFIG_DISPLAY_CPUINFO is not set +# CONFIG_DISPLAY_BOARDINFO is not set +CONFIG_ARCH_EARLY_INIT_R=y +CONFIG_BOARD_EARLY_INIT_F=y +CONFIG_HUSH_PARSER=y +# CONFIG_CMD_IMLS is not set +# CONFIG_CMD_FLASH is not set +CONFIG_CMD_MMC=y +CONFIG_CMD_PART=y +CONFIG_CMD_SF=y +CONFIG_CMD_SPI=y +CONFIG_CMD_I2C=y +CONFIG_CMD_USB=y +# CONFIG_CMD_FPGA is not set +# CONFIG_CMD_SETEXPR is not set +CONFIG_CMD_TFTPPUT=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MII=y +CONFIG_CMD_PING=y +CONFIG_CMD_CACHE=y +CONFIG_CMD_TIME=y +CONFIG_CMD_MVEBU_BUBT=y +CONFIG_CMD_EXT4=y +CONFIG_CMD_EXT4_WRITE=y +CONFIG_CMD_FAT=y +CONFIG_CMD_FS_GENERIC=y +CONFIG_MAC_PARTITION=y +CONFIG_ISO_PARTITION=y +CONFIG_EFI_PARTITION=y +CONFIG_BLOCK_CACHE=y +CONFIG_DM_I2C=y +CONFIG_SYS_I2C_MVTWSI=y +CONFIG_MISC=y +CONFIG_DM_MMC=y +CONFIG_MMC_SDHCI=y +CONFIG_MMC_SDHCI_XENON=y +CONFIG_SPI_FLASH=y +CONFIG_SPI_FLASH_MACRONIX=y +CONFIG_SPI_FLASH_SPANSION=y +CONFIG_SPI_FLASH_STMICRO=y +CONFIG_PHY_MARVELL=y +CONFIG_MVPP2=y +CONFIG_PCI=y +CONFIG_DM_PCI=y +CONFIG_PCIE_DW_MVEBU=y +CONFIG_MVEBU_COMPHY_SUPPORT=y +CONFIG_PINCTRL=y +CONFIG_PINCTRL_ARMADA_8K=y +# CONFIG_SPL_SERIAL_PRESENT is not set +CONFIG_DEBUG_UART_BASE=0xf0512000 +CONFIG_DEBUG_UART_CLOCK=200000000 +CONFIG_DEBUG_UART_SHIFT=2 +CONFIG_DEBUG_UART_ANNOUNCE=y +CONFIG_SYS_NS16550=y +CONFIG_USB=y +CONFIG_DM_USB=y +CONFIG_USB_XHCI_HCD=y +CONFIG_USB_EHCI_HCD=y +CONFIG_USB_STORAGE=y +CONFIG_SMBIOS_MANUFACTURER=""