mirror of
https://github.com/AsahiLinux/u-boot
synced 2024-12-02 09:30:10 +00:00
56d1dded62
The omap3_evm board does not boot when commit:
a47ca2cf67 ("ARM: omap3: evm: Add kernel image loading from UBIFS and EXT4")
is applied after commit:
3dde8f2037 ("Merge git://git.denx.de/u-boot-mmc")
This commit reduces the CONFIG_EXTRA_ENV_SETTINGS size and better
leverages the existing distro bootcmd infrastructure.
- Use updated UBIFS support from config_distro_bootcmd.h
- Use LEGACY_MMC naming found in am335x_evm.h and ti_omap4_common.h
- Remove extra environment content that is no longer needed
[MMC(0:1)/extlinux/extlinux.conf]
---8<-------------------------------------------------------------------
default omap3-evm-mmc-fat
label omap3-evm-mmc-fat
kernel /zImage
fdt /omap3-evm.dtb
append console=ttyO0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait
---8<-------------------------------------------------------------------
[MMC(0:2)/boot/extlinux/extlinux.conf]
---8<-------------------------------------------------------------------
default omap3-evm-mmc-ext4
label omap3-evm-mmc-ext4
kernel /boot/zImage
fdt /boot/omap3-evm.dtb
append console=ttyO0,115200n8 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait
---8<-------------------------------------------------------------------
[NAND(ubi0:rootfs)/boot/extlinux/extlinux.conf]
---8<-------------------------------------------------------------------
default omap3-evm-nand-ubifs
label omap3-evm-nand-ubifs
kernel /boot/zImage
fdt /boot/omap3-evm.dtb
append console=ttyO0,115200n8 root=ubi0:rootfs rw ubi.mtd=rootfs noinitrd rootfstype=ubifs rootwait
---8<-------------------------------------------------------------------
Fixes: a47ca2cf67 ("ARM: omap3: evm: Add kernel image loading from UBIFS and EXT4")
Signed-off-by: Derald D. Woods <woods.technical@gmail.com>
171 lines
5.4 KiB
C
171 lines
5.4 KiB
C
/*
|
|
* Configuration settings for the TI OMAP3 EVM board.
|
|
*
|
|
* Copyright (C) 2006-2011 Texas Instruments Incorporated - http://www.ti.com/
|
|
*
|
|
* Author :
|
|
* Manikandan Pillai <mani.pillai@ti.com>
|
|
* Derived from Beagle Board and 3430 SDP code by
|
|
* Richard Woodruff <r-woodruff2@ti.com>
|
|
* Syed Mohammed Khasim <khasim@ti.com>
|
|
*
|
|
* Manikandan Pillai <mani.pillai@ti.com>
|
|
*
|
|
* SPDX-License-Identifier: GPL-2.0+
|
|
*/
|
|
|
|
#ifndef __CONFIG_H
|
|
#define __CONFIG_H
|
|
|
|
#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */
|
|
|
|
#include <configs/ti_omap3_common.h>
|
|
|
|
/*
|
|
* We are only ever GP parts and will utilize all of the "downloaded image"
|
|
* area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB).
|
|
*/
|
|
#undef CONFIG_SPL_TEXT_BASE
|
|
#define CONFIG_SPL_TEXT_BASE 0x40200000
|
|
|
|
#define CONFIG_SPL_FRAMEWORK
|
|
|
|
#define CONFIG_MISC_INIT_R
|
|
#define CONFIG_CMDLINE_TAG
|
|
#define CONFIG_SETUP_MEMORY_TAGS
|
|
#define CONFIG_INITRD_TAG
|
|
#define CONFIG_REVISION_TAG
|
|
|
|
/* Override OMAP3 serial console configuration */
|
|
#undef CONFIG_CONS_INDEX
|
|
#define CONFIG_CONS_INDEX 1
|
|
#define CONFIG_SYS_NS16550_COM1 OMAP34XX_UART1
|
|
#if defined(CONFIG_SPL_BUILD)
|
|
#undef CONFIG_SYS_NS16550_REG_SIZE
|
|
#endif /* CONFIG_SPL_BUILD */
|
|
|
|
/* NAND */
|
|
#if defined(CONFIG_NAND)
|
|
#define CONFIG_SYS_FLASH_BASE NAND_BASE
|
|
#define CONFIG_SYS_MAX_NAND_DEVICE 1
|
|
#define CONFIG_SYS_NAND_5_ADDR_CYCLE
|
|
#define CONFIG_SYS_NAND_PAGE_COUNT 64
|
|
#define CONFIG_SYS_NAND_PAGE_SIZE 2048
|
|
#define CONFIG_SYS_NAND_OOBSIZE 64
|
|
#define CONFIG_SYS_NAND_BLOCK_SIZE (128*1024)
|
|
#define CONFIG_SYS_NAND_BAD_BLOCK_POS NAND_LARGE_BADBLOCK_POS
|
|
#define CONFIG_SYS_NAND_ECCPOS {2, 3, 4, 5, 6, 7, 8, 9,\
|
|
10, 11, 12, 13}
|
|
#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_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
|
|
#endif /* CONFIG_SPL_OS_BOOT */
|
|
#endif /* CONFIG_NAND */
|
|
|
|
/* MUSB */
|
|
|
|
/* USB EHCI */
|
|
#define CONFIG_SYS_USB_FAT_BOOT_PARTITION 1
|
|
|
|
/* Environment */
|
|
#define CONFIG_PREBOOT "usb start"
|
|
|
|
#include <config_distro_defaults.h>
|
|
|
|
#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 " "
|
|
|
|
#define BOOT_TARGET_DEVICES(func) \
|
|
func(MMC, mmc, 0) \
|
|
func(LEGACY_MMC, legacy_mmc, 0) \
|
|
func(UBIFS, ubifs, 0) \
|
|
func(NAND, nand, 0)
|
|
|
|
#include <config_distro_bootcmd.h>
|
|
|
|
#define CONFIG_EXTRA_ENV_SETTINGS \
|
|
MEM_LAYOUT_ENV_SETTINGS \
|
|
"fdtfile=" CONFIG_DEFAULT_FDT_FILE "\0" \
|
|
"mtdids=" CONFIG_MTDIDS_DEFAULT "\0" \
|
|
"mtdparts=" CONFIG_MTDPARTS_DEFAULT "\0" \
|
|
"fdt_high=0xffffffff\0" \
|
|
"bootdir=/boot\0" \
|
|
"bootenv=uEnv.txt\0" \
|
|
"bootfile=zImage\0" \
|
|
"bootubivol=rootfs\0" \
|
|
"bootubipart=rootfs\0" \
|
|
"optargs=\0" \
|
|
"mmcdev=0\0" \
|
|
"mmcpart=2\0" \
|
|
"bootpart=${mmcdev}:${mmcpart}\0" \
|
|
"console=ttyO0,115200n8\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" \
|
|
"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} ${bootenv}\0" \
|
|
"ext4bootenv=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootenv}\0" \
|
|
"importbootenv=echo Importing environment from mmc ...; " \
|
|
"env import -t ${loadaddr} ${filesize}\0" \
|
|
"mmcbootenv=mmc dev ${mmcdev}; " \
|
|
"if mmc rescan; then " \
|
|
"run loadbootenv && run importbootenv; " \
|
|
"run ext4bootenv && run importbootenv; " \
|
|
"if test -n $uenvcmd; then " \
|
|
"echo Running uenvcmd ...; " \
|
|
"run uenvcmd; " \
|
|
"fi; " \
|
|
"fi\0" \
|
|
"loadimage=ext4load mmc ${bootpart} ${loadaddr} ${bootdir}/${bootfile}\0" \
|
|
"loaddtb=ext4load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
|
|
"mmcboot=run mmcbootenv; " \
|
|
"if run loadimage && run loaddtb; then " \
|
|
"echo Booting ${bootdir}/${bootfile} from mmc ${bootpart} ...; " \
|
|
"run mmcargs; " \
|
|
"if test ${bootfile} = uImage; then " \
|
|
"bootm ${loadaddr} - ${fdtaddr}; " \
|
|
"fi; " \
|
|
"if test ${bootfile} = zImage; then " \
|
|
"bootz ${loadaddr} - ${fdtaddr}; " \
|
|
"fi; " \
|
|
"fi\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}; " \
|
|
"fi\0" \
|
|
BOOTENV
|
|
|
|
#endif /* __CONFIG_H */
|