mirror of
https://github.com/u-boot/u-boot.git
synced 2024-11-29 07:33:29 +08:00
ARM: omap3: evm: Sync with omap3_beagle configuration
This 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 ------------------------------------------------- Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
This commit is contained in:
Derald D. Woods
Tom Rini
parent
d233ccb1d8
commit
b6e2543cf9
@ -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
|
||||
|
||||
@ -54,51 +54,58 @@
|
||||
#define CONFIG_SYS_NAND_ECCSIZE 512
|
||||
#define CONFIG_SYS_NAND_ECCBYTES 3
|
||||
#define CONFIG_NAND_OMAP_ECCSCHEME OMAP_ECC_BCH8_CODE_HW_DETECTION_SW
|
||||
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
|
||||
#define CONFIG_ENV_IS_IN_NAND 1
|
||||
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
|
||||
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
|
||||
#define CONFIG_SYS_ENV_SECT_SIZE SZ_128K
|
||||
#define CONFIG_ENV_OFFSET 0x260000
|
||||
#define CONFIG_ENV_ADDR 0x260000
|
||||
#define CONFIG_ENV_OVERWRITE
|
||||
#define CONFIG_MTD_PARTITIONS /* required for UBI partition support */
|
||||
/* NAND: SPL falcon mode configs */
|
||||
#if defined(CONFIG_SPL_OS_BOOT)
|
||||
#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000
|
||||
#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x2a0000
|
||||
#endif /* CONFIG_SPL_OS_BOOT */
|
||||
#endif /* CONFIG_NAND */
|
||||
|
||||
/* MUSB */
|
||||
|
||||
/* USB EHCI */
|
||||
#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1
|
||||
|
||||
/* Environment */
|
||||
#define CONFIG_ENV_SIZE SZ_128K
|
||||
|
||||
#define CONFIG_PREBOOT "usb start"
|
||||
|
||||
#define MEM_LAYOUT_ENV_SETTINGS \
|
||||
DEFAULT_LINUX_BOOT_ENV
|
||||
|
||||
#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \
|
||||
"bootcmd_" #devtypel #instance "=" \
|
||||
"run nandboot\0"
|
||||
#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \
|
||||
#devtypel #instance " "
|
||||
|
||||
#define BOOTENV_DEV_LEGACY_MMC(devtypeu, devtypel, instance) \
|
||||
"bootcmd_" #devtypel #instance "=" \
|
||||
"setenv mmcdev " #instance "; " \
|
||||
"setenv bootpart " #instance ":${mmcpart} ; " \
|
||||
"run mmcboot\0"
|
||||
#define BOOTENV_DEV_NAME_LEGACY_MMC(devtypeu, devtypel, instance) \
|
||||
#devtypel #instance " "
|
||||
|
||||
#if defined(CONFIG_NAND)
|
||||
|
||||
#define BOOTENV_DEV_NAND(devtypeu, devtypel, instance) \
|
||||
"bootcmd_" #devtypel #instance "=" \
|
||||
"if test ${mtdids} = '' || test ${mtdparts} = '' ; then " \
|
||||
"echo NAND boot disabled: No mtdids and/or mtdparts; " \
|
||||
"else " \
|
||||
"run nandboot; " \
|
||||
"fi\0"
|
||||
#define BOOTENV_DEV_NAME_NAND(devtypeu, devtypel, instance) \
|
||||
#devtypel #instance " "
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
func(MMC, mmc, 0) \
|
||||
func(LEGACY_MMC, legacy_mmc, 0) \
|
||||
func(UBIFS, ubifs, 0) \
|
||||
func(NAND, nand, 0)
|
||||
|
||||
#else /* !CONFIG_NAND */
|
||||
|
||||
#define BOOT_TARGET_DEVICES(func) \
|
||||
func(MMC, mmc, 0) \
|
||||
func(LEGACY_MMC, legacy_mmc, 0)
|
||||
|
||||
#endif /* CONFIG_NAND */
|
||||
|
||||
#include <config_distro_bootcmd.h>
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
@ -107,31 +114,29 @@
|
||||
"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
|
||||
"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
|
||||
"fdt_high=0xffffffff\0" \
|
||||
"console=ttyO0,115200n8\0" \
|
||||
"bootdir=/boot\0" \
|
||||
"bootenv=uEnv.txt\0" \
|
||||
"bootfile=zImage\0" \
|
||||
"bootpart=0:2\0" \
|
||||
"bootubivol=rootfs\0" \
|
||||
"bootubipart=rootfs\0" \
|
||||
"optargs=\0" \
|
||||
"mmcdev=0\0" \
|
||||
"mmcpart=2\0" \
|
||||
"bootpart=${mmcdev}:${mmcpart}\0" \
|
||||
"console=ttyO0,115200n8\0" \
|
||||
"mmcroot=/dev/mmcblk0p2 rw\0" \
|
||||
"mmcrootfstype=ext4 rootwait\0" \
|
||||
"mmcargs=setenv bootargs console=${console} " \
|
||||
"${mtdparts} " \
|
||||
"${optargs} " \
|
||||
"root=/dev/mmcblk0p2 rw " \
|
||||
"rootfstype=ext4 rootwait\0" \
|
||||
"nandargs=setenv bootargs console=${console} " \
|
||||
"${mtdparts} " \
|
||||
"${optargs} " \
|
||||
"root=ubi0:rootfs rw ubi.mtd=rootfs noinitrd " \
|
||||
"rootfstype=ubifs rootwait\0" \
|
||||
"root=${mmcroot} " \
|
||||
"rootfstype=${mmcrootfstype}\0" \
|
||||
"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
|
||||
"ext4bootenv=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootenv}\0" \
|
||||
"importbootenv=echo Importing environment from mmc ...; " \
|
||||
"importbootenv=echo Importing environment from mmc${mmcdev} ...; " \
|
||||
"env import -t ${loadaddr} ${filesize}\0" \
|
||||
"mmcbootenv=mmc dev ${mmcdev}; " \
|
||||
"mmcbootenv=setenv bootpart ${mmcdev}:${mmcpart}; " \
|
||||
"mmc dev ${mmcdev}; " \
|
||||
"if mmc rescan; then " \
|
||||
"run loadbootenv && run importbootenv; " \
|
||||
"run ext4bootenv && run importbootenv; " \
|
||||
@ -153,8 +158,14 @@
|
||||
"bootz ${loadaddr} - ${fdtaddr}; " \
|
||||
"fi; " \
|
||||
"fi\0" \
|
||||
"nandboot=" \
|
||||
"if nand read ${loadaddr} kernel && nand read ${fdtaddr} dtb; then " \
|
||||
"nandroot=ubi0:rootfs ubi.mtd=rootfs rw noinitrd\0" \
|
||||
"nandrootfstype=ubifs rootwait\0" \
|
||||
"nandargs=setenv bootargs console=${console} " \
|
||||
"${mtdparts} " \
|
||||
"${optargs} " \
|
||||
"root=${nandroot} " \
|
||||
"rootfstype=${nandrootfstype}\0" \
|
||||
"nandboot=if nand read ${loadaddr} kernel && nand read ${fdtaddr} dtb; then " \
|
||||
"echo Booting uImage from NAND MTD 'kernel' partition ...; " \
|
||||
"run nandargs; " \
|
||||
"bootm ${loadaddr} - ${fdtaddr}; " \
|
||||
|
||||
Loading…
Reference in New Issue
Block a user