ARM: omap3: beagle, evm: synchronize common setup
cover ARM: omap3: beagle, evm: synchronize common setup
This short series is an attempt to make this set of boards use the same default configuration items where possible. This was prompted by an investigation into enabling SERIAL_SEARCH_ALL on omap3_evm. This feature now works for omap3_evm after this series.
The 'RFC' is because of changes in the default NAND layout of MTDPARTS_DEFAULT and using ENV_IS_IN_FAT. More detail is provided with the patches. As most things are configurable now, this should not be an issue. I am trying to get simple defaults that just boot and expose the common core features.
Derald D. Woods (3):
ARM: omap3: beagle: Set 'mtdids' and 'mtdparts' in board file
ARM: omap3: beagle: Enable DM_SERIAL, update distro usage and NAND
layout
ARM: omap3: evm: Sync with omap3_beagle configuration
board/ti/beagle/beagle.c | 8 ++ configs/omap3_beagle_defconfig | 29 ++++- configs/omap3_evm_defconfig | 25 +++-- include/configs/omap3_beagle.h | 241 +++++++++++++++++++++++------------------ include/configs/omap3_evm.h | 71 +++++++----- 5 files changed, 220 insertions(+), 154 deletions(-)
Signature · 1 line
2.16.1
RFC PATCH 1/3 ARM: omap3: beagle: Set 'mtdids' and 'mtdparts' in board file
BeagleBoard 'xM' does not really have NAND. CONFIG_MTDIDS_DEFAULT and CONFIG_MTDPARTS_DEFAULT can/should be empty for 'xM'. This commit sets the defined values if they exist.
--- board/ti/beagle/beagle.c | 8 ++++++++ 1 file changed, 8 insertions(+)
board/ti/beagle/beagle.c +8 -0
@@ -521,6 +521,14 @@ int misc_init_r(void)if (generate_fake_mac)omap_die_id_usbethaddr (); +#if defined(CONFIG_MTDIDS_DEFAULT ) && defined(CONFIG_MTDPARTS_DEFAULT ) +if (strlen (CONFIG_MTDIDS_DEFAULT )) +env_set ("mtdids" ,CONFIG_MTDIDS_DEFAULT ); + +if (strlen (CONFIG_MTDPARTS_DEFAULT )) +env_set ("mtdparts" ,CONFIG_MTDPARTS_DEFAULT ); +#endif +return 0 ; }
Signature · 1 line
2.16.1
RFC PATCH 2/3 ARM: omap3: beagle: Enable DM_SERIAL, update distro usage and NAND layout
In reply to Derald D. WoodsThis commit does the following for BeagleBoard{-xM}:
- Enable DM_SERIAL which also enables SPL_DM_SERIAL
- Misc. config updates in support of DM_SERIAL
- Use CONFIG_ENV_IS_IN_FAT because BeagleBoard-xM has no NAND
- Use updated NAND layout (BeagleBoard):
device nand0 <omap2-nand.0>, # parts = 6 #: name size offset ------------------------------------------------- 0: spl 0x00080000(512k) 0x00000000 1: u-boot 0x001e0000(1920k) 0x00080000 2: u-boot-env 0x00020000(128k) 0x00260000 3: dtb 0x00020000(128k) 0x00280000 4: kernel 0x00600000(6m) 0x002a0000 5: rootfs 0x0f760000(-) 0x008a0000 -------------------------------------------------
- Use MMC and UBIFS support from config_distro_bootcmd.h
- Use LEGACY_MMC and NAND support defined in omap3_beagle.h
[MMC(0:1)/extlinux/extlinux.conf] ---8<------------------------------------------------------------------- default omap3-beagle-mmc-fat
label omap3-beagle-mmc-fat
kernel /zImage
fdt /omap3-beagle.dtb
append console=ttyO2,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait
---8<-------------------------------------------------------------------
[LEGACY_MMC(0:2)/boot/extlinux/extlinux.conf] ---8<------------------------------------------------------------------- default omap3-beagle-mmc-ext4
label omap3-beagle-mmc-ext4
kernel /boot/zImage
fdt /boot/omap3-beagle.dtb
append console=ttyO2,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait
---8<-------------------------------------------------------------------
[UBIFS(ubi0:rootfs)/boot/extlinux/extlinux.conf] ---8<-------------------------------------------------------------------
default omap3-beagle-nand-ubifs
label omap3-beagle-nand-ubifs
kernel /boot/zImage
fdt /boot/omap3-beagle.dtb
append console=ttyO2,115200n8 root=ubi0:rootfs rw ubi.mtd=rootfs rootfstype=ubifs rootwait
---8<-------------------------------------------------------------------
The board's 'bootcmd' can also be overridden with:
CONFIG_BOOTCOMMAND="run findfdt; run mmcboot" CONFIG_BOOTCOMMAND="run findfdt; run nandboot" CONFIG_BOOTCOMMAND="run findfdt; run ramboot"
or
CONFIG_BOOTCOMMAND="run findfdt; run somethingelse"
The use of 'run findfdt' is required.
--- configs/omap3_beagle_defconfig | 29 ++++- include/configs/omap3_beagle.h | 241 +++++++++++++++++++++++------------------ 2 files changed, 157 insertions(+), 113 deletions(-)
configs/omap3_beagle_defconfig +23 -6
@@ -4,32 +4,43 @@ CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_TARGET_OMAP3_BEAGLE=y CONFIG_DEFAULT_DEVICE_TREE="omap3-beagle" CONFIG_DISTRO_DEFAULTS=y -# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DEFAULT_FDT_FILE="omap3-beagle.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y +# CONFIG_SPL_EXT_SUPPORT is not set CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SYS_PROMPT="BeagleBoard # " CONFIG_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_CMD_SPL=y -CONFIG_CMD_SPL_NAND_OFS=0x240000 +CONFIG_CMD_SPL_NAND_OFS=0x280000 +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y +CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nand0=nand" -CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)" +CONFIG_CMD_FS_UUID=y +CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" +CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1920k(u-boot),128k(u-boot-env),128k(dtb),6m(kernel),-(rootfs)" +CONFIG_CMD_UBI=y +# CONFIG_ISO_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_OF_CONTROL=y -CONFIG_ENV_IS_IN_NAND=y +CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" +CONFIG_SPL_DM=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS0=y CONFIG_LED_STATUS_BIT=1
@@ -45,11 +56,15 @@ CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y +CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_SIMPLE=y +CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OMAP3=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_TWL4030_USB=y
@@ -65,3 +80,5 @@ CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_FAT_WRITE=y CONFIG_BCH=y +CONFIG_SPL_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set
include/configs/omap3_beagle.h +134 -107
300 lines not on this page · raw message
Signature · 1 line
2.16.1
RFC PATCH 3/3 ARM: omap3: evm: Sync with omap3_beagle configuration
In reply to Derald D. WoodsThis commit does the following for OMAP3 EVM:
- Track omap3_beagle changes where possible
- Remove CONFIG_SYS_MPUCLK and CONFIG_MTD which are not needed for the default board configuration to work.
- Remove CONFIG_SPL_SYS_MALLOC_SIMPLE and CONFIG_SYS_MALLOC_F_LEN from default config. CONFIG_SYS_MALLOC_F_LEN=0x400 is set by configuration automatically. [allows board to boot with SERIAL_SEARCH_ALL=y]
- Use CONFIG_ENV_IS_IN_FAT because of development flexibility
- Use updated NAND layout:
device nand0 <omap2-nand.0>, # parts = 6 #: name size offset ------------------------------------------------- 0: spl 0x00080000(512k) 0x00000000 1: u-boot 0x001e0000(1920k) 0x00080000 2: u-boot-env 0x00020000(128k) 0x00260000 3: dtb 0x00020000(128k) 0x00280000 4: kernel 0x00600000(6m) 0x002a0000 5: rootfs 0x0f760000(-) 0x008a0000 -------------------------------------------------
--- configs/omap3_evm_defconfig | 25 +++++++++------- include/configs/omap3_evm.h | 71 ++++++++++++++++++++++++++------------------- 2 files changed, 55 insertions(+), 41 deletions(-)
configs/omap3_evm_defconfig +14 -11
@@ -1,22 +1,22 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y CONFIG_SYS_TEXT_BASE=0x80100000 -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_SYS_MPUCLK=720 CONFIG_TARGET_OMAP3_EVM=y CONFIG_DEFAULT_DEVICE_TREE="omap3-evm" CONFIG_DISTRO_DEFAULTS=y -CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y -CONFIG_SPL_SYS_MALLOC_SIMPLE=y -CONFIG_SPL_ENV_SUPPORT=y # CONFIG_SPL_EXT_SUPPORT is not set CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="OMAP3_EVM # " -# CONFIG_CMD_IMI is not set +CONFIG_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x82000000 +CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x280000 +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y
@@ -30,23 +30,27 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FS_UUID=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1792k(u-boot),128k(dtb),128k(u-boot-env),6m(kernel),-(rootfs)" +CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1920k(u-boot),128k(u-boot-env),128k(dtb),6m(kernel),-(rootfs)" CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set CONFIG_SPL_PARTITION_UUIDS=y CONFIG_OF_CONTROL=y -CONFIG_ENV_IS_IN_NAND=y +CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SPL_DM=y CONFIG_MMC_OMAP_HS=y -CONFIG_MTD=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y +CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x2C000000 CONFIG_SMC911X_32_BIT=y +CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y
@@ -54,14 +58,13 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_OMAP3=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_OMAP2PLUS=y +CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0x5678 -CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y CONFIG_FAT_WRITE=y CONFIG_BCH=y -CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SPL_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set
include/configs/omap3_evm.h +41 -30
132 lines not on this page · raw message
Signature · 1 line
2.16.1
v2 cover ARM: omap3: beagle, evm: synchronize common setup
In reply to Derald D. WoodsThis short series is an attempt to make this set of boards use the same default configuration items where possible. This was prompted by an investigation into enabling SERIAL_SEARCH_ALL on omap3_evm. This feature now works for omap3_evm after this series.
The series changes the default NAND layout of MTDPARTS_DEFAULT and uses ENV_IS_IN_FAT. More detail is provided with the patches. As most things are configurable now, this should not be an issue. I am trying to get simple defaults that just boot and expose the common core features. This will make future testing and maintenance a bit more predictable, as there will be a very similar comparable set of boards.
Derald D. Woods (3):
ARM: omap3: beagle: Set 'mtdids' and 'mtdparts' in board file
ARM: omap3: beagle: Enable DM_SERIAL, update distro usage and NAND
layout
ARM: omap3: evm: Sync with omap3_beagle configuration
board/ti/beagle/beagle.c | 8 ++ configs/omap3_beagle_defconfig | 29 ++++- configs/omap3_evm_defconfig | 25 +++-- include/configs/omap3_beagle.h | 241 +++++++++++++++++++++++------------------ include/configs/omap3_evm.h | 71 +++++++----- 5 files changed, 220 insertions(+), 154 deletions(-)
--
v2:
- update cover letter and remove 'RFC' from series
- rebase and test on recent master
Signature · 1 line
2.16.2
PATCH v2 1/3 ARM: omap3: beagle: Set 'mtdids' and 'mtdparts' in board file
BeagleBoard 'xM' does not really have NAND. CONFIG_MTDIDS_DEFAULT and CONFIG_MTDPARTS_DEFAULT can/should be empty for 'xM'. This commit sets the defined values if they exist.
--- board/ti/beagle/beagle.c | 8 ++++++++ 1 file changed, 8 insertions(+)
board/ti/beagle/beagle.c +8 -0
@@ -521,6 +521,14 @@ int misc_init_r(void)if (generate_fake_mac)omap_die_id_usbethaddr (); +#if defined(CONFIG_MTDIDS_DEFAULT ) && defined(CONFIG_MTDPARTS_DEFAULT ) +if (strlen (CONFIG_MTDIDS_DEFAULT )) +env_set ("mtdids" ,CONFIG_MTDIDS_DEFAULT ); + +if (strlen (CONFIG_MTDPARTS_DEFAULT )) +env_set ("mtdparts" ,CONFIG_MTDPARTS_DEFAULT ); +#endif +return 0 ; }
Signature · 1 line
2.16.2
PATCH v2 2/3 ARM: omap3: beagle: Enable DM_SERIAL, update distro usage and NAND layout
In reply to Derald D. WoodsThis commit does the following for BeagleBoard{-xM}:
- Enable DM_SERIAL which also enables SPL_DM_SERIAL
- Misc. config updates in support of DM_SERIAL
- Use CONFIG_ENV_IS_IN_FAT because BeagleBoard-xM has no NAND
- Use updated NAND layout (BeagleBoard):
device nand0 <omap2-nand.0>, # parts = 6 #: name size offset ------------------------------------------------- 0: spl 0x00080000(512k) 0x00000000 1: u-boot 0x001e0000(1920k) 0x00080000 2: u-boot-env 0x00020000(128k) 0x00260000 3: dtb 0x00020000(128k) 0x00280000 4: kernel 0x00600000(6m) 0x002a0000 5: rootfs 0x0f760000(-) 0x008a0000 -------------------------------------------------
- Use MMC and UBIFS support from config_distro_bootcmd.h
- Use LEGACY_MMC and NAND support defined in omap3_beagle.h
[MMC(0:1)/extlinux/extlinux.conf] ---8<------------------------------------------------------------------- default omap3-beagle-mmc-fat
label omap3-beagle-mmc-fat
kernel /zImage
fdt /omap3-beagle.dtb
append console=ttyO2,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait
---8<-------------------------------------------------------------------
[LEGACY_MMC(0:2)/boot/extlinux/extlinux.conf] ---8<------------------------------------------------------------------- default omap3-beagle-mmc-ext4
label omap3-beagle-mmc-ext4
kernel /boot/zImage
fdt /boot/omap3-beagle.dtb
append console=ttyO2,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait
---8<-------------------------------------------------------------------
[UBIFS(ubi0:rootfs)/boot/extlinux/extlinux.conf] ---8<-------------------------------------------------------------------
default omap3-beagle-nand-ubifs
label omap3-beagle-nand-ubifs
kernel /boot/zImage
fdt /boot/omap3-beagle.dtb
append console=ttyO2,115200n8 root=ubi0:rootfs rw ubi.mtd=rootfs rootfstype=ubifs rootwait
---8<-------------------------------------------------------------------
The board's 'bootcmd' can also be overridden with:
CONFIG_BOOTCOMMAND="run findfdt; run mmcboot" CONFIG_BOOTCOMMAND="run findfdt; run nandboot" CONFIG_BOOTCOMMAND="run findfdt; run ramboot"
or
CONFIG_BOOTCOMMAND="run findfdt; run somethingelse"
The use of 'run findfdt' is required.
--- configs/omap3_beagle_defconfig | 29 +++-- include/configs/omap3_beagle.h | 239 +++++++++++++++++++++++------------------ 2 files changed, 155 insertions(+), 113 deletions(-)
configs/omap3_beagle_defconfig +23 -6
@@ -4,32 +4,43 @@ CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_TARGET_OMAP3_BEAGLE=y CONFIG_DEFAULT_DEVICE_TREE="omap3-beagle" CONFIG_DISTRO_DEFAULTS=y -# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DEFAULT_FDT_FILE="omap3-beagle.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y +# CONFIG_SPL_EXT_SUPPORT is not set CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SYS_PROMPT="BeagleBoard # " CONFIG_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_CMD_SPL=y -CONFIG_CMD_SPL_NAND_OFS=0x240000 +CONFIG_CMD_SPL_NAND_OFS=0x280000 +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y +CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nand0=nand" -CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)" +CONFIG_CMD_FS_UUID=y +CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" +CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1920k(u-boot),128k(u-boot-env),128k(dtb),6m(kernel),-(rootfs)" +CONFIG_CMD_UBI=y +# CONFIG_ISO_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_OF_CONTROL=y -CONFIG_ENV_IS_IN_NAND=y +CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" +CONFIG_SPL_DM=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS0=y CONFIG_LED_STATUS_BIT=1
@@ -45,11 +56,15 @@ CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y +CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_SIMPLE=y +CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OMAP3=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_TWL4030_USB=y
@@ -65,3 +80,5 @@ CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_FAT_WRITE=y CONFIG_BCH=y +CONFIG_SPL_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set
include/configs/omap3_beagle.h +132 -107
298 lines not on this page · raw message
--
v2:
- 'config_distro_defaults.h' has been removed
--
2.16.2
PATCH v2 3/3 ARM: omap3: evm: Sync with omap3_beagle configuration
In reply to Derald D. WoodsThis commit does the following for OMAP3 EVM:
- Track omap3_beagle changes where possible
- Remove CONFIG_SYS_MPUCLK and CONFIG_MTD which are not needed for the default board configuration to work.
- Remove CONFIG_SPL_SYS_MALLOC_SIMPLE and CONFIG_SYS_MALLOC_F_LEN from default config. CONFIG_SYS_MALLOC_F_LEN=0x400 is set by configuration automatically. [allows board to boot with SERIAL_SEARCH_ALL=y]
- Use CONFIG_ENV_IS_IN_FAT because of development flexibility
- Use updated NAND layout:
device nand0 <omap2-nand.0>, # parts = 6 #: name size offset ------------------------------------------------- 0: spl 0x00080000(512k) 0x00000000 1: u-boot 0x001e0000(1920k) 0x00080000 2: u-boot-env 0x00020000(128k) 0x00260000 3: dtb 0x00020000(128k) 0x00280000 4: kernel 0x00600000(6m) 0x002a0000 5: rootfs 0x0f760000(-) 0x008a0000 -------------------------------------------------
--- configs/omap3_evm_defconfig | 25 +++++++++------- include/configs/omap3_evm.h | 71 ++++++++++++++++++++++++++------------------- 2 files changed, 55 insertions(+), 41 deletions(-)
configs/omap3_evm_defconfig +14 -11
@@ -1,22 +1,22 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y CONFIG_SYS_TEXT_BASE=0x80100000 -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_SYS_MPUCLK=720 CONFIG_TARGET_OMAP3_EVM=y CONFIG_DEFAULT_DEVICE_TREE="omap3-evm" CONFIG_DISTRO_DEFAULTS=y -CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y -CONFIG_SPL_SYS_MALLOC_SIMPLE=y -CONFIG_SPL_ENV_SUPPORT=y # CONFIG_SPL_EXT_SUPPORT is not set CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="OMAP3_EVM # " -# CONFIG_CMD_IMI is not set +CONFIG_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x82000000 +CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x280000 +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y
@@ -30,23 +30,27 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FS_UUID=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1792k(u-boot),128k(dtb),128k(u-boot-env),6m(kernel),-(rootfs)" +CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1920k(u-boot),128k(u-boot-env),128k(dtb),6m(kernel),-(rootfs)" CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set CONFIG_SPL_PARTITION_UUIDS=y CONFIG_OF_CONTROL=y -CONFIG_ENV_IS_IN_NAND=y +CONFIG_ENV_IS_IN_FAT=y +CONFIG_ENV_FAT_INTERFACE="mmc" +CONFIG_ENV_FAT_DEVICE_AND_PART="0:1" CONFIG_SPL_DM=y CONFIG_MMC_OMAP_HS=y -CONFIG_MTD=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y +CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x2C000000 CONFIG_SMC911X_32_BIT=y +CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y
@@ -54,14 +58,13 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_OMAP3=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_OMAP2PLUS=y +CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0x5678 -CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y CONFIG_FAT_WRITE=y CONFIG_BCH=y -CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SPL_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set
include/configs/omap3_evm.h +41 -30
131 lines not on this page · raw message
Signature · 1 line
2.16.2
v2 cover ARM: omap3: beagle, evm: synchronize common setup
In reply to Derald D. WoodsQuoted 11 lines · Derald D. Woods
This short series is an attempt to make this set of boards use the same default configuration items where possible. This was prompted by an investigation into enabling
SERIAL_SEARCH_ALLonomap3_evm. This feature now works foromap3_evmafter this series.The series changes the default NAND layout of
MTDPARTS_DEFAULTand usesENV_IS_IN_FAT. More detail is provided with the patches. As most things are configurable now, this should not be an issue. I am trying to get simple defaults that just boot and expose the common core features. This will make future testing and maintenance a bit more predictable, as there will be a very similar comparable set of boards.
I was thinking, wouldn't we want to update the beagle code now to do env in NAND on beagleboard and env on FAT on xM? We could provide a new env_get_location() to return the right location based on board. 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/20180224/b7733008/attachment.sig>
v2 cover ARM: omap3: beagle, evm: synchronize common setup
Quoted 14 lines · Tom Rini
Quoted 11 lines · Derald D. Woods
This short series is an attempt to make this set of boards use the same default configuration items where possible. This was prompted by an investigation into enabling
SERIAL_SEARCH_ALLonomap3_evm. This feature now works foromap3_evmafter this series.The series changes the default NAND layout of
MTDPARTS_DEFAULTand usesENV_IS_IN_FAT. More detail is provided with the patches. As most things are configurable now, this should not be an issue. I am trying to get simple defaults that just boot and expose the common core features. This will make future testing and maintenance a bit more predictable, as there will be a very similar comparable set of boards.
Quoted 4 lines
I was thinking, wouldn't we want to update the beagle code now to do env in NAND on beagleboard and env on FAT on xM? We could provide a new
env_get_location()to return the right location based on board. Thanks!
I thought of that too. xM can never use NAND. So FAT is always right for it. Regular BeagleBoard(3530) can have the environment in either location. Configuration can simply handle the user preference. I did not see a reason to add any more logic into an already heavy board file. The Overo boards are equally heavy with board type logic. For now, my thinking was to allow configuration do the work.
Derald
v2 cover ARM: omap3: beagle, evm: synchronize common setup
Quoted 20 lines · Derald D. Woods
Quoted 14 lines · Tom Rini
Quoted 11 lines · Derald D. Woods
This short series is an attempt to make this set of boards use the same default configuration items where possible. This was prompted by an investigation into enabling
SERIAL_SEARCH_ALLonomap3_evm. This feature now works foromap3_evmafter this series.The series changes the default NAND layout of
MTDPARTS_DEFAULTand usesENV_IS_IN_FAT. More detail is provided with the patches. As most things are configurable now, this should not be an issue. I am trying to get simple defaults that just boot and expose the common core features. This will make future testing and maintenance a bit more predictable, as there will be a very similar comparable set of boards.Quoted 4 lines
I was thinking, wouldn't we want to update the beagle code now to do env in NAND on beagleboard and env on FAT on xM? We could provide a new
env_get_location()to return the right location based on board. Thanks!
Quoted 6 lines
I thought of that too. xM can never use NAND. So FAT is always right for it. Regular BeagleBoard(3530) can have the environment in either location. Configuration can simply handle the user preference. I did not see a reason to add any more logic into an already heavy board file. The Overo boards are equally heavy with board type logic. For now, my thinking was to allow configuration do the work.
OK, but on the other hand, xM must have an SD card inserted and vanilla does not require an SD card. So now those users need to put in an SD card. Now, I honestly don't know how big a deal that is really, so I won't nak the patches. But I do think it would be the best user experience to have classic continue to work as-is and xM to finally get functional env.
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/20180224/9273d5ed/attachment.sig>
v2 cover ARM: omap3: beagle, evm: synchronize common setup
Quoted 28 lines · Tom Rini
Quoted 20 lines · Derald D. Woods
Quoted 14 lines · Tom Rini
Quoted 11 lines · Derald D. Woods
This short series is an attempt to make this set of boards use the same default configuration items where possible. This was prompted by an investigation into enabling
SERIAL_SEARCH_ALLonomap3_evm. This feature now works foromap3_evmafter this series.The series changes the default NAND layout of
MTDPARTS_DEFAULTand usesENV_IS_IN_FAT. More detail is provided with the patches. As most things are configurable now, this should not be an issue. I am trying to get simple defaults that just boot and expose the common core features. This will make future testing and maintenance a bit more predictable, as there will be a very similar comparable set of boards.Quoted 4 lines
I was thinking, wouldn't we want to update the beagle code now to do env in NAND on beagleboard and env on FAT on xM? We could provide a new
env_get_location()to return the right location based on board. Thanks!Quoted 6 lines
I thought of that too. xM can never use NAND. So FAT is always right for it. Regular BeagleBoard(3530) can have the environment in either location. Configuration can simply handle the user preference. I did not see a reason to add any more logic into an already heavy board file. The Overo boards are equally heavy with board type logic. For now, my thinking was to allow configuration do the work.
Quoted 7 lines
OK, but on the other hand, xM must have an SD card inserted and vanilla does not require an SD card. So now those users need to put in an SD card. Now, I honestly don't know how big a deal that is really, so I won't nak the patches. But I do think it would be the best user experience to have classic continue to work as-is and xM to finally get functional env.
I will try to add the 'env_get_location'. So let's hold until I can push a 'v3' of the series.
The possible env locations:
ENVL_FATENVL_MMCENVL_NANDENVL_UBI
If those make sense, 'env_get_location' priority will select one of them.
Derald
v2 cover ARM: omap3: beagle, evm: synchronize common setup
Quoted 40 lines · Derald Woods
Quoted 28 lines · Tom Rini
Quoted 20 lines · Derald D. Woods
Quoted 14 lines · Tom Rini
Quoted 11 lines · Derald D. Woods
This short series is an attempt to make this set of boards use the same default configuration items where possible. This was prompted by an investigation into enabling
SERIAL_SEARCH_ALLonomap3_evm. This feature now works foromap3_evmafter this series.The series changes the default NAND layout of
MTDPARTS_DEFAULTand usesENV_IS_IN_FAT. More detail is provided with the patches. As most things are configurable now, this should not be an issue. I am trying to get simple defaults that just boot and expose the common core features. This will make future testing and maintenance a bit more predictable, as there will be a very similar comparable set of boards.Quoted 4 lines
I was thinking, wouldn't we want to update the beagle code now to do env in NAND on beagleboard and env on FAT on xM? We could provide a new
env_get_location()to return the right location based on board. Thanks!Quoted 6 lines
I thought of that too. xM can never use NAND. So FAT is always right for it. Regular BeagleBoard(3530) can have the environment in either location. Configuration can simply handle the user preference. I did not see a reason to add any more logic into an already heavy board file. The Overo boards are equally heavy with board type logic. For now, my thinking was to allow configuration do the work.
Quoted 7 lines
OK, but on the other hand, xM must have an SD card inserted and vanilla does not require an SD card. So now those users need to put in an SD card. Now, I honestly don't know how big a deal that is really, so I won't nak the patches. But I do think it would be the best user experience to have classic continue to work as-is and xM to finally get functional env.
I will try to add the '
env_get_location'. So let's hold until I can push a 'v3' of the series.
Quoted 8 lines
The possible env locations:
ENVL_FATENVL_MMCENVL_NANDENVL_UBIIf those make sense, '
env_get_location' priority will select one of them.
Sounds good, 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/20180224/0f25b6e9/attachment.sig>
v2 cover ARM: omap3: beagle, evm: synchronize common setup
In reply to Derald WoodsQuoted 40 lines · Derald Woods
Quoted 28 lines · Tom Rini
Quoted 20 lines · Derald D. Woods
Quoted 14 lines · Tom Rini
Quoted 11 lines · Derald D. Woods
This short series is an attempt to make this set of boards use the same default configuration items where possible. This was prompted by an investigation into enabling
SERIAL_SEARCH_ALLonomap3_evm. This feature now works foromap3_evmafter this series.The series changes the default NAND layout of
MTDPARTS_DEFAULTand usesENV_IS_IN_FAT. More detail is provided with the patches. As most things are configurable now, this should not be an issue. I am trying to get simple defaults that just boot and expose the common core features. This will make future testing and maintenance a bit more predictable, as there will be a very similar comparable set of boards.Quoted 4 lines
I was thinking, wouldn't we want to update the beagle code now to do env in NAND on beagleboard and env on FAT on xM? We could provide a new
env_get_location()to return the right location based on board. Thanks!Quoted 6 lines
I thought of that too. xM can never use NAND. So FAT is always right for it. Regular BeagleBoard(3530) can have the environment in either location. Configuration can simply handle the user preference. I did not see a reason to add any more logic into an already heavy board file. The Overo boards are equally heavy with board type logic. For now, my thinking was to allow configuration do the work.
Quoted 7 lines
OK, but on the other hand, xM must have an SD card inserted and vanilla does not require an SD card. So now those users need to put in an SD card. Now, I honestly don't know how big a deal that is really, so I won't nak the patches. But I do think it would be the best user experience to have classic continue to work as-is and xM to finally get functional env.
I will try to add the '
env_get_location'. So let's hold until I can push a 'v3' of the series.
Quoted 9 lines
The possible env locations:
ENVL_FATENVL_MMCENVL_NANDENVL_UBIIf those make sense, '
env_get_location' priority will select one of them.
Using 'env_get_location' is not working with this diff:
---8<------------------------------------------------------------------
board/ti/beagle/beagle.c +29 -0
@@ -33,6 +33,7 @@#include <linux/usb/ch9.h> #include <linux/usb/gadget.h> #include <linux/usb/musb.h> +#include <environment.h> #include "beagle.h" #include <command.h>
@@ -332,6 +333,34 @@ static struct musb_hdrc_platform_data musb_plat = { };#endif +#if defined(CONFIG_SPL_BUILD ) && \ + defined(CONFIG_ENV_IS_IN_NAND ) && \ + defined(CONFIG_ENV_IS_IN_FAT ) +enum env_location env_get_location (enum env_operation op,int prio) +{ +switch (prio) { +case 0 : +return ENVL_FAT ; +case 1 : +switch (get_board_revision ()) { +case REVISION_AXBX : +case REVISION_CX : +case REVISION_C4 : +return ENVL_NAND ; +case REVISION_XM_AB : +case REVISION_XM_C : +default : +return ENVL_FAT ; + } +break ; +default : +break ; + } + +return ENVL_UNKNOWN ; +} +#endif /* CONFIG_SPL_BUILD && CONFIG_ENV_IS_IN_{NAND,FAT} */ +/* * Routine: misc_init_r * Description: Configure board specific parts
---8<-------------------------------------------------------------------
Additionally, it will not boot without using '#if defined(CONFIG_SPL_BUILD)'. When booting on BeagleBoard-xM, I get the following:
---8<------------------------------------------------------------------- U-Boot SPL 2018.03-rc3-00033-g881e2514dd-dirty (Feb 25 2018 - 12:26:00 -0600) Trying to boot from MMC1spl_load_image_fat_os: error reading image args, err - -2
U-Boot 2018.03-rc3-00033-g881e2514dd-dirty (Feb 25 2018 - 12:26:00 -0600)
OMAP3630/3730-GP ES1.2, CPU-OPP2, L3-200MHz, Max CPU Clock 1 GHz
Model: TI OMAP3 BeagleBoard xM
OMAP3 Beagle board + LPDDR/NAND
I2C: ready DRAM: 256 MiB NAND: 0 MiB MMC: OMAP SD/MMC: 0
Loading Environment from FAT... *** Warning - bad CRC, using default environment
Failed (-5)
Loading Environment from NAND... *** Warning - readenv() failed, using default environment
Failed (-5)
Beagle xM Rev C
No EEPROM on expansion board
OMAP die ID: 46da00029ff800000168300f15027017
Net: usb_ether
starting USB...
USB0: USB EHCI 1.00
scanning bus 0 for devices... 3 USB Device(s) found
scanning usb for storage devices... 0 Storage Device(s) found scanning usb for ethernet devices... 1 Ethernet Device(s) found
Hit any key to stop autoboot: 0
BeagleBoard-xM # env save
Saving Environment to NAND... Failed (1)
Saving Environment to NAND... Failed (1)
Saving Environment to NAND... Failed (1)
Saving Environment to NAND... Failed (1)
Saving Environment to NAND... Failed (1)
Saving Environment to NAND... Failed (1)
...
---8<-------------------------------------------------------------------
The configuration mix for 'env_get_location' needs some documentation and examples. The only other user is "board/sunxi/board.c". I do not have that board. This seems to be a path that is not ready to use right now. This should be handled on a separate series.
I will send a 'v3' of the series to leave CONFIG_ENV_IS_IN_NAND as the default. All other changes will remain. I will take a look at 'env_get_location' again@some later time. Right now I just want to have my three OMAP3 boards booting with similar setups.
As always, I am open to suggestions.
Derald
v3 cover ARM: omap3: beagle, evm: synchronize common setup
This short series is an attempt to make this set of boards use the same default configuration items where possible. This was prompted by an investigation into enabling SERIAL_SEARCH_ALL on omap3_evm. This feature now works for omap3_evm after this series.
The series changes the default NAND layout of MTDPARTS_DEFAULT. More detail is provided with the patches. As most things are configurable now, this should not be an issue. I am trying to get simple defaults that just boot and expose the common core features. This will make future testing and maintenance a bit more predictable, as there will be a very similar and comparable set of boards.
Derald D. Woods (3):
ARM: omap3: beagle: Set 'mtdids' and 'mtdparts' in board file
ARM: omap3: beagle: Enable DM_SERIAL, update distro usage and NAND
layout
ARM: omap3: evm: Sync with omap3_beagle configuration
board/ti/beagle/beagle.c | 8 ++ configs/omap3_beagle_defconfig | 25 ++++- configs/omap3_evm_defconfig | 21 ++-- include/configs/omap3_beagle.h | 239 +++++++++++++++++++++++------------------ include/configs/omap3_evm.h | 71 ++++++------ 5 files changed, 212 insertions(+), 152 deletions(-)
--
v3:
- Leave environment in NAND
v2:
- update cover letter and remove 'RFC' from series
- rebase and test on recent master
Signature · 1 line
2.16.2
PATCH v3 1/3 ARM: omap3: beagle: Set 'mtdids' and 'mtdparts' in board file
BeagleBoard 'xM' does not really have NAND. CONFIG_MTDIDS_DEFAULT and CONFIG_MTDPARTS_DEFAULT can/should be empty for 'xM'. This commit sets the defined values if they exist.
--- board/ti/beagle/beagle.c | 8 ++++++++ 1 file changed, 8 insertions(+)
board/ti/beagle/beagle.c +8 -0
@@ -521,6 +521,14 @@ int misc_init_r(void)if (generate_fake_mac)omap_die_id_usbethaddr (); +#if defined(CONFIG_MTDIDS_DEFAULT ) && defined(CONFIG_MTDPARTS_DEFAULT ) +if (strlen (CONFIG_MTDIDS_DEFAULT )) +env_set ("mtdids" ,CONFIG_MTDIDS_DEFAULT ); + +if (strlen (CONFIG_MTDPARTS_DEFAULT )) +env_set ("mtdparts" ,CONFIG_MTDPARTS_DEFAULT ); +#endif +return 0 ; }
Signature · 1 line
2.16.2
PATCH v3 1/3 ARM: omap3: beagle: Set 'mtdids' and 'mtdparts' in board file
Quoted 5 lines · Derald D. Woods
BeagleBoard 'xM' does not really have NAND.
CONFIG_MTDIDS_DEFAULTandCONFIG_MTDPARTS_DEFAULTcan/should be empty for 'xM'. This commit sets the defined values if they exist.Signed-off-by Derald D. Woods <[email protected]>
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/20180314/71be67fc/attachment.sig>
PATCH v3 2/3 ARM: omap3: beagle: Enable DM_SERIAL, update distro usage and NAND layout
In reply to Derald D. WoodsThis commit does the following for BeagleBoard{-xM}:
- Enable DM_SERIAL which also enables SPL_DM_SERIAL
- Misc. config updates in support of DM_SERIAL
- Use updated NAND layout (BeagleBoard):
device nand0 <omap2-nand.0>, # parts = 6 #: name size offset ------------------------------------------------- 0: spl 0x00080000(512k) 0x00000000 1: u-boot 0x001e0000(1920k) 0x00080000 2: u-boot-env 0x00020000(128k) 0x00260000 3: dtb 0x00020000(128k) 0x00280000 4: kernel 0x00600000(6m) 0x002a0000 5: rootfs 0x0f760000(-) 0x008a0000 -------------------------------------------------
- Use MMC and UBIFS support from config_distro_bootcmd.h
- Use LEGACY_MMC and NAND support defined in omap3_beagle.h
[MMC(0:1)/extlinux/extlinux.conf] ---8<------------------------------------------------------------------- default omap3-beagle-mmc-fat
label omap3-beagle-mmc-fat
kernel /zImage
fdt /omap3-beagle.dtb
append console=ttyO2,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait
---8<-------------------------------------------------------------------
[LEGACY_MMC(0:2)/boot/extlinux/extlinux.conf] ---8<------------------------------------------------------------------- default omap3-beagle-mmc-ext4
label omap3-beagle-mmc-ext4
kernel /boot/zImage
fdt /boot/omap3-beagle.dtb
append console=ttyO2,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait
---8<-------------------------------------------------------------------
[UBIFS(ubi0:rootfs)/boot/extlinux/extlinux.conf] ---8<-------------------------------------------------------------------
default omap3-beagle-nand-ubifs
label omap3-beagle-nand-ubifs
kernel /boot/zImage
fdt /boot/omap3-beagle.dtb
append console=ttyO2,115200n8 root=ubi0:rootfs rw ubi.mtd=rootfs rootfstype=ubifs rootwait
---8<-------------------------------------------------------------------
The board's 'bootcmd' can also be overridden with:
CONFIG_BOOTCOMMAND="run findfdt; run mmcboot" CONFIG_BOOTCOMMAND="run findfdt; run nandboot" CONFIG_BOOTCOMMAND="run findfdt; run ramboot"
or
CONFIG_BOOTCOMMAND="run findfdt; run somethingelse"
The use of 'run findfdt' is required.
--- configs/omap3_beagle_defconfig | 25 ++++- include/configs/omap3_beagle.h | 239 +++++++++++++++++++++++------------------ 2 files changed, 152 insertions(+), 112 deletions(-)
configs/omap3_beagle_defconfig +20 -5
@@ -4,32 +4,41 @@ CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_TARGET_OMAP3_BEAGLE=y CONFIG_DEFAULT_DEVICE_TREE="omap3-beagle" CONFIG_DISTRO_DEFAULTS=y -# CONFIG_USE_BOOTCOMMAND is not set +CONFIG_BOOTCOMMAND="run findfdt; run distro_bootcmd" CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DEFAULT_FDT_FILE="omap3-beagle.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y +# CONFIG_SPL_EXT_SUPPORT is not set CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_OS_BOOT=y +CONFIG_SYS_PROMPT="BeagleBoard # " CONFIG_FASTBOOT=y CONFIG_FASTBOOT_BUF_ADDR=0x82000000 CONFIG_CMD_SPL=y -CONFIG_CMD_SPL_NAND_OFS=0x240000 +CONFIG_CMD_SPL_NAND_OFS=0x280000 +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y CONFIG_CMD_I2C=y CONFIG_CMD_MMC=y CONFIG_CMD_NAND=y +CONFIG_CMD_NAND_TRIMFFS=y CONFIG_CMD_SPI=y CONFIG_CMD_USB=y CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y -CONFIG_CMD_MTDPARTS=y -CONFIG_MTDIDS_DEFAULT="nand0=nand" -CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)" +CONFIG_CMD_FS_UUID=y +CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" +CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1920k(u-boot),128k(u-boot-env),128k(dtb),6m(kernel),-(rootfs)" +CONFIG_CMD_UBI=y +# CONFIG_ISO_PARTITION is not set +# CONFIG_EFI_PARTITION is not set +CONFIG_SPL_PARTITION_UUIDS=y CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y +CONFIG_SPL_DM=y CONFIG_LED_STATUS=y CONFIG_LED_STATUS0=y CONFIG_LED_STATUS_BIT=1
@@ -45,11 +54,15 @@ CONFIG_LED_STATUS_CMD=y CONFIG_MMC_OMAP_HS=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y +CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_SIMPLE=y +CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y CONFIG_USB_EHCI_HCD=y +CONFIG_USB_OMAP3=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_OMAP2PLUS=y CONFIG_TWL4030_USB=y
@@ -65,3 +78,5 @@ CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_SMSC95XX=y CONFIG_FAT_WRITE=y CONFIG_BCH=y +CONFIG_SPL_OF_LIBFDT=y +# CONFIG_EFI_LOADER is not set
include/configs/omap3_beagle.h +132 -107
298 lines not on this page · raw message
--
v3:
- Leave environment in NAND
v2:
- 'config_distro_defaults.h' has been removed
--
2.16.2
PATCH v3 2/3 ARM: omap3: beagle: Enable DM_SERIAL, update distro usage and NAND layout
Quoted 18 lines · Derald D. Woods
This commit does the following for BeagleBoard{-xM}:
- Enable
DM_SERIALwhich also enablesSPL_DM_SERIAL
- Misc. config updates in support ofDM_SERIAL
- Use updated NAND layout (BeagleBoard):device nand0 <omap2-nand.0>, # parts = 6 #: name size offset ------------------------------------------------- 0: spl 0x00080000(512k) 0x00000000 1: u-boot 0x001e0000(1920k) 0x00080000 2: u-boot-env 0x00020000(128k) 0x00260000 3: dtb 0x00020000(128k) 0x00280000 4: kernel 0x00600000(6m) 0x002a0000 5: rootfs 0x0f760000(-) 0x008a0000 -------------------------------------------------
Quoted 4 lines
- Use MMC and UBIFS support from
config_distro_bootcmd.h
- UseLEGACY_MMCand NAND support defined inomap3_beagle.h[MMC(0:1)/extlinux/extlinux.conf]
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/20180314/c2155918/attachment.sig>
PATCH v3 3/3 ARM: omap3: evm: Sync with omap3_beagle configuration
In reply to Derald D. WoodsThis commit does the following for OMAP3 EVM:
- Track omap3_beagle changes where possible
- Remove CONFIG_SYS_MPUCLK and CONFIG_MTD which are not needed for the default board configuration to work.
- Remove CONFIG_SPL_SYS_MALLOC_SIMPLE and CONFIG_SYS_MALLOC_F_LEN from default config. CONFIG_SYS_MALLOC_F_LEN=0x400 is set by configuration automatically. [allows board to boot with SERIAL_SEARCH_ALL=y]
- Use updated NAND layout:
device nand0 <omap2-nand.0>, # parts = 6 #: name size offset ------------------------------------------------- 0: spl 0x00080000(512k) 0x00000000 1: u-boot 0x001e0000(1920k) 0x00080000 2: u-boot-env 0x00020000(128k) 0x00260000 3: dtb 0x00020000(128k) 0x00280000 4: kernel 0x00600000(6m) 0x002a0000 5: rootfs 0x0f760000(-) 0x008a0000 -------------------------------------------------
--- configs/omap3_evm_defconfig | 21 +++++++------- include/configs/omap3_evm.h | 71 ++++++++++++++++++++++++++------------------- 2 files changed, 52 insertions(+), 40 deletions(-)
configs/omap3_evm_defconfig +11 -10
@@ -1,22 +1,22 @@ CONFIG_ARM=y CONFIG_ARCH_OMAP2PLUS=y CONFIG_SYS_TEXT_BASE=0x80100000 -CONFIG_SYS_MALLOC_F_LEN=0x2000 -CONFIG_SYS_MPUCLK=720 CONFIG_TARGET_OMAP3_EVM=y CONFIG_DEFAULT_DEVICE_TREE="omap3-evm" CONFIG_DISTRO_DEFAULTS=y -CONFIG_BOOTDELAY=3 CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_DEFAULT_FDT_FILE="omap3-evm.dtb" CONFIG_VERSION_VARIABLE=y CONFIG_SPL=y -CONFIG_SPL_SYS_MALLOC_SIMPLE=y -CONFIG_SPL_ENV_SUPPORT=y # CONFIG_SPL_EXT_SUPPORT is not set CONFIG_SPL_MTD_SUPPORT=y +CONFIG_SPL_OS_BOOT=y CONFIG_SYS_PROMPT="OMAP3_EVM # " -# CONFIG_CMD_IMI is not set +CONFIG_FASTBOOT=y +CONFIG_FASTBOOT_BUF_ADDR=0x82000000 +CONFIG_CMD_SPL=y +CONFIG_CMD_SPL_NAND_OFS=0x280000 +CONFIG_CMD_SPL_WRITE_SIZE=0x20000 CONFIG_CMD_ASKENV=y # CONFIG_CMD_FLASH is not set CONFIG_CMD_GPIO=y
@@ -30,7 +30,7 @@ CONFIG_CMD_CACHE=y CONFIG_CMD_EXT4_WRITE=y CONFIG_CMD_FS_UUID=y CONFIG_MTDIDS_DEFAULT="nand0=omap2-nand.0" -CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1792k(u-boot),128k(dtb),128k(u-boot-env),6m(kernel),-(rootfs)" +CONFIG_MTDPARTS_DEFAULT="mtdparts=omap2-nand.0:512k(spl),1920k(u-boot),128k(u-boot-env),128k(dtb),6m(kernel),-(rootfs)" CONFIG_CMD_UBI=y # CONFIG_ISO_PARTITION is not set # CONFIG_EFI_PARTITION is not set
@@ -39,14 +39,16 @@ CONFIG_OF_CONTROL=y CONFIG_ENV_IS_IN_NAND=y CONFIG_SPL_DM=y CONFIG_MMC_OMAP_HS=y -CONFIG_MTD=y CONFIG_NAND=y CONFIG_SYS_NAND_BUSWIDTH_16BIT=y +CONFIG_SYS_NAND_U_BOOT_LOCATIONS=y +CONFIG_SYS_NAND_U_BOOT_OFFS=0x80000 CONFIG_SPL_NAND_SIMPLE=y CONFIG_NETDEVICES=y CONFIG_SMC911X=y CONFIG_SMC911X_BASE=0x2C000000 CONFIG_SMC911X_32_BIT=y +CONFIG_DM_SERIAL=y CONFIG_SYS_NS16550=y CONFIG_OMAP3_SPI=y CONFIG_USB=y
@@ -54,14 +56,13 @@ CONFIG_USB_EHCI_HCD=y CONFIG_USB_OMAP3=y CONFIG_USB_MUSB_GADGET=y CONFIG_USB_MUSB_OMAP2PLUS=y +CONFIG_USB_STORAGE=y CONFIG_USB_GADGET=y CONFIG_USB_GADGET_MANUFACTURER="Texas Instruments" CONFIG_USB_GADGET_VENDOR_NUM=0x0451 CONFIG_USB_GADGET_PRODUCT_NUM=0x5678 -CONFIG_USB_GADGET_DOWNLOAD=y CONFIG_USB_ETHER=y CONFIG_FAT_WRITE=y CONFIG_BCH=y -CONFIG_OF_LIBFDT_OVERLAY=y CONFIG_SPL_OF_LIBFDT=y # CONFIG_EFI_LOADER is not set
include/configs/omap3_evm.h +41 -30
131 lines not on this page · raw message
Signature · 5 lines
v3: - Leave environment in NAND -- 2.16.2
PATCH v3 3/3 ARM: omap3: evm: Sync with omap3_beagle configuration
Quoted 22 lines · Derald D. Woods
This commit does the following for OMAP3 EVM:
- Track
omap3_beaglechanges where possible
- RemoveCONFIG_SYS_MPUCLKandCONFIG_MTDwhich are not needed for the default board configuration to work.
- RemoveCONFIG_SPL_SYS_MALLOC_SIMPLEandCONFIG_SYS_MALLOC_F_LENfrom default config.CONFIG_SYS_MALLOC_F_LEN=0x400is set by configuration automatically. [allows board to boot with SERIAL_SEARCH_ALL=y]
- Use updated NAND layout:device nand0 <omap2-nand.0>, # parts = 6 #: name size offset ------------------------------------------------- 0: spl 0x00080000(512k) 0x00000000 1: u-boot 0x001e0000(1920k) 0x00080000 2: u-boot-env 0x00020000(128k) 0x00260000 3: dtb 0x00020000(128k) 0x00280000 4: kernel 0x00600000(6m) 0x002a0000 5: rootfs 0x0f760000(-) 0x008a0000 -------------------------------------------------
Quoted 1 line
Signed-off-by Derald D. Woods <[email protected]>
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/20180314/44cd0fb8/attachment.sig>