From d233ccb1d84b901f7e23e6d9b4f2c6a57198b23b Mon Sep 17 00:00:00 2001 From: "Derald D. Woods" Date: Mon, 26 Feb 2018 17:52:58 -0600 Subject: ARM: omap3: beagle: Enable DM_SERIAL, update distro usage and NAND layout This 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 , # 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. Signed-off-by: Derald D. Woods --- configs/omap3_beagle_defconfig | 25 ++++++++++++++++++++----- 1 file changed, 20 insertions(+), 5 deletions(-) (limited to 'configs') diff --git a/configs/omap3_beagle_defconfig b/configs/omap3_beagle_defconfig index f0169a4544..35e0b3cd84 100644 --- a/configs/omap3_beagle_defconfig +++ b/configs/omap3_beagle_defconfig @@ -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 -- cgit v1.2.3