Skip to contentSkip to conversation

configs: sama5d27_som1_ek: Cleanup and new

PATCH New Codrin Ciubotariu 2 participants 7 messages Aug 21, 2018 – Sep 26, 2018

lore
Share & tools
lore
#0 lore raw

cover configs: sama5d27_som1_ek: Cleanup and new

This series basically adds a new defconfig for sama5d27_som1_ek board to boot from uSD. Also needed to cleanup the board's config header.

Codrin Ciubotariu (3):
configs: sama5d27_som1_ek: Remove unnecessary FAT_ENV_xxx macros
configs: sama5d27_som1_ek: Set CONFIG_BOOTARGS using Kconfig
configs: sama5d27_som1_ek: Add defconfig for ENV/boot from uSD

 configs/sama5d27_som1_ek_mmc1_defconfig | 91 +++++++++++++++++++++++++
 configs/sama5d27_som1_ek_mmc_defconfig  |  2 +
 include/configs/sama5d27_som1_ek.h      | 10 +--
 3 files changed, 95 insertions(+), 8 deletions(-)
 create mode 100644 configs/sama5d27_som1_ek_mmc1_defconfig
Signature · 1 line
2.17.1
#1 lore raw

PATCH 1/3 configs: sama5d27_som1_ek: Remove unnecessary FAT_ENV_xxx macros

FAT_ENV_xxx options can now be set using Kconfig, so we no longer need them in the config files.

---
 include/configs/sama5d27_som1_ek.h | 3 ---
 1 file changed, 3 deletions(-)
include/configs/sama5d27_som1_ek.h +0 -3
index 0cae301da26..5e2249711de 100644
@@ -39,9 +39,6 @@
 #undef CONFIG_BOOTCOMMAND
 #ifdef CONFIG_SD_BOOT
 /* u-boot env in sd/mmc card */
-#define FAT_ENV_INTERFACE	"mmc"
-#define FAT_ENV_DEVICE_AND_PART	"0"
-#define FAT_ENV_FILE		"uboot.env"
 #define CONFIG_ENV_SIZE		0x4000
 /* bootstrap + u-boot + env in sd card */
 #define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x21000000 at91-sama5d27_som1_ek.dtb; " \
Signature · 1 line
2.17.1
#2 lore raw

PATCH 1/3 configs: sama5d27_som1_ek: Remove unnecessary FAT_ENV_xxx macros

Quoted 4 lines · Codrin Ciubotariu

FAT_ENV_xxx options can now be set using Kconfig, so we no longer need them in the config files.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180926/82bf8408/attachment.sig>
#3 lore raw

PATCH 2/3 configs: sama5d27_som1_ek: Set CONFIG_BOOTARGS using Kconfig

In reply to Codrin Ciubotariu

CONFIG_BOOTARGS can be set using Kconfig, so we no longer need it in the config files.

---
 configs/sama5d27_som1_ek_mmc_defconfig | 2 ++
 include/configs/sama5d27_som1_ek.h     | 3 ---
 2 files changed, 2 insertions(+), 3 deletions(-)
configs/sama5d27_som1_ek_mmc_defconfig +2 -0
index 53d4b7ce0ca..8e50cef8dbc 100644
@@ -22,6 +22,8 @@ CONFIG_FIT=y
 CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
 CONFIG_SD_BOOT=y
 CONFIG_BOOTDELAY=3
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
 # CONFIG_DISPLAY_BOARDINFO is not set
 CONFIG_SPL_SEPARATE_BSS=y
 CONFIG_HUSH_PARSER=y
include/configs/sama5d27_som1_ek.h +0 -3
index 5e2249711de..5b1f77ba24c 100644
@@ -44,9 +44,6 @@
 #define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x21000000 at91-sama5d27_som1_ek.dtb; " \
 				"fatload mmc 0:1 0x22000000 zImage; " \
 				"bootz 0x22000000 - 0x21000000"
-#undef CONFIG_BOOTARGS
-#define CONFIG_BOOTARGS \
-	"console=ttyS0,115200 earlyprintk root=/dev/mmcblk0p2 rw rootwait"
 #endif
 
 #ifdef CONFIG_QSPI_BOOT
Signature · 1 line
2.17.1
#4 lore raw

PATCH 2/3 configs: sama5d27_som1_ek: Set CONFIG_BOOTARGS using Kconfig

Quoted 4 lines · Codrin Ciubotariu

CONFIG_BOOTARGS can be set using Kconfig, so we no longer need it in the config files.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180926/1bb8e352/attachment.sig>
#5 lore raw

PATCH 3/3 configs: sama5d27_som1_ek: Add defconfig for ENV/boot from uSD

In reply to Codrin Ciubotariu

This adds a defconfig for sama5d27_som1_ek board to get environment from uSD. The defconfig is made from sama5d27_som1_ek_mmc_defconfig, with 'bootcmd' and 'bootargs' changed to kernel, device-tree and rootfs from uSD. The environment is expected to be found in uSD's FAT partition.

---
 configs/sama5d27_som1_ek_mmc1_defconfig | 91 +++++++++++++++++++++++++
 include/configs/sama5d27_som1_ek.h      |  4 +-
 2 files changed, 93 insertions(+), 2 deletions(-)
 create mode 100644 configs/sama5d27_som1_ek_mmc1_defconfig
configs/sama5d27_som1_ek_mmc1_defconfig new file +91 -0
new file mode 100644
index 00000000000..0ac2445887d
@@ -0,0 +1,91 @@
+CONFIG_ARM=y
+CONFIG_ARCH_AT91=y
+CONFIG_SYS_TEXT_BASE=0x23f00000
+CONFIG_TARGET_SAMA5D27_SOM1_EK=y
+CONFIG_SPL_GPIO_SUPPORT=y
+CONFIG_SPL_LIBCOMMON_SUPPORT=y
+CONFIG_SPL_LIBGENERIC_SUPPORT=y
+CONFIG_SYS_MALLOC_F_LEN=0x2000
+CONFIG_SPL_MMC_SUPPORT=y
+CONFIG_SPL_SERIAL_SUPPORT=y
+CONFIG_SPL_DRIVERS_MISC_SUPPORT=y
+CONFIG_SPL=y
+CONFIG_DEBUG_UART_BOARD_INIT=y
+CONFIG_DEBUG_UART_BASE=0xf8020000
+CONFIG_DEBUG_UART_CLOCK=82000000
+CONFIG_SPL_FAT_SUPPORT=y
+CONFIG_SPL_LIBDISK_SUPPORT=y
+CONFIG_DEFAULT_DEVICE_TREE="at91-sama5d27_som1_ek"
+CONFIG_DEBUG_UART=y
+CONFIG_ENV_VARS_UBOOT_CONFIG=y
+CONFIG_FIT=y
+CONFIG_SYS_EXTRA_OPTIONS="SAMA5D2"
+CONFIG_SD_BOOT=y
+CONFIG_BOOTDELAY=3
+CONFIG_USE_BOOTARGS=y
+CONFIG_BOOTARGS="console=ttyS0,115200 earlyprintk root=/dev/mmcblk1p2 rw rootwait"
+# CONFIG_DISPLAY_BOARDINFO is not set
+CONFIG_SPL_SEPARATE_BSS=y
+CONFIG_HUSH_PARSER=y
+CONFIG_CMD_BOOTZ=y
+# CONFIG_CMD_IMI is not set
+# CONFIG_CMD_FLASH is not set
+CONFIG_CMD_I2C=y
+# CONFIG_CMD_LOADS is not set
+CONFIG_CMD_MMC=y
+CONFIG_CMD_SF=y
+CONFIG_CMD_USB=y
+CONFIG_CMD_DHCP=y
+CONFIG_CMD_PING=y
+CONFIG_CMD_EXT4=y
+CONFIG_CMD_FAT=y
+CONFIG_OF_CONTROL=y
+CONFIG_SPL_OF_CONTROL=y
+CONFIG_OF_SPL_REMOVE_PROPS="interrupts interrupt-parent dmas dma-names"
+CONFIG_ENV_IS_IN_FAT=y
+CONFIG_ENV_FAT_DEVICE_AND_PART="1"
+CONFIG_DM=y
+CONFIG_SPL_DM=y
+CONFIG_SPL_DM_SEQ_ALIAS=y
+CONFIG_CLK=y
+CONFIG_SPL_CLK=y
+CONFIG_CLK_AT91=y
+CONFIG_AT91_UTMI=y
+CONFIG_AT91_H32MX=y
+CONFIG_AT91_GENERIC_CLK=y
+CONFIG_DM_GPIO=y
+CONFIG_ATMEL_PIO4=y
+CONFIG_DM_I2C=y
+CONFIG_SYS_I2C_AT91=y
+CONFIG_I2C_EEPROM=y
+CONFIG_DM_MMC=y
+CONFIG_MMC_SDHCI=y
+CONFIG_MMC_SDHCI_ATMEL=y
+CONFIG_DM_SPI_FLASH=y
+CONFIG_SPI_FLASH=y
+CONFIG_SPI_FLASH_ATMEL=y
+CONFIG_SPI_FLASH_MACRONIX=y
+CONFIG_SPI_FLASH_STMICRO=y
+CONFIG_SPI_FLASH_SST=y
+CONFIG_DM_ETH=y
+CONFIG_MACB=y
+CONFIG_PINCTRL=y
+CONFIG_SPL_PINCTRL=y
+CONFIG_PINCTRL_AT91PIO4=y
+CONFIG_DM_SERIAL=y
+CONFIG_DEBUG_UART_ATMEL=y
+CONFIG_DEBUG_UART_ANNOUNCE=y
+CONFIG_ATMEL_USART=y
+CONFIG_SPI=y
+CONFIG_DM_SPI=y
+CONFIG_TIMER=y
+CONFIG_SPL_TIMER=y
+CONFIG_ATMEL_PIT_TIMER=y
+CONFIG_USB=y
+CONFIG_DM_USB=y
+CONFIG_USB_EHCI_HCD=y
+CONFIG_USB_STORAGE=y
+CONFIG_USB_GADGET=y
+CONFIG_USB_GADGET_ATMEL_USBA=y
+CONFIG_DM_VIDEO=y
+CONFIG_ATMEL_HLCD=y
include/configs/sama5d27_som1_ek.h +2 -2
index 5b1f77ba24c..6af4fb51855 100644
@@ -41,8 +41,8 @@
 /* u-boot env in sd/mmc card */
 #define CONFIG_ENV_SIZE		0x4000
 /* bootstrap + u-boot + env in sd card */
-#define CONFIG_BOOTCOMMAND	"fatload mmc 0:1 0x21000000 at91-sama5d27_som1_ek.dtb; " \
-				"fatload mmc 0:1 0x22000000 zImage; " \
+#define CONFIG_BOOTCOMMAND	"fatload mmc " CONFIG_ENV_FAT_DEVICE_AND_PART " 0x21000000 at91-sama5d27_som1_ek.dtb; " \
+				"fatload mmc " CONFIG_ENV_FAT_DEVICE_AND_PART " 0x22000000 zImage; " \
 				"bootz 0x22000000 - 0x21000000"
 #endif
 
Signature · 1 line
2.17.1
#6 lore raw

PATCH 3/3 configs: sama5d27_som1_ek: Add defconfig for ENV/boot from uSD

Quoted 6 lines · Codrin Ciubotariu

This adds a defconfig for sama5d27_som1_ek board to get environment from uSD. The defconfig is made from sama5d27_som1_ek_mmc_defconfig, with 'bootcmd' and 'bootargs' changed to kernel, device-tree and rootfs from uSD. The environment is expected to be found in uSD's FAT partition.

Applied to u-boot/master, thanks!

Signature · 8 lines
Tom
-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 819 bytes
Desc: not available
URL: <http://lists.denx.de/pipermail/u-boot/attachments/20180926/b0f2ede0/attachment.sig>