Skip to content
Snippets Groups Projects
Commit 4b37928d authored by Derald D. Woods's avatar Derald D. Woods Committed by Tom Rini
Browse files

ARM: dts: omap3-beagle{-xm}: Enable DM and devicetree for BeagleBoard 

This commit updates the configuration files needed to support OF_CONTROL
on the OMAP3 BeagleBoard(s).
parent 3ff0d801
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
board/ti/beagle/beagle.c
+ 11
− 0
View file @ 4b37928d
...@@ -103,6 +103,17 @@ int board_init(void) ...@@ -103,6 +103,17 @@ int board_init(void)
return 0; return 0;
} }
#if defined(CONFIG_SPL_OS_BOOT)
int spl_start_uboot(void)
{
/* break into full u-boot on 'c' */
if (serial_tstc() && serial_getc() == 'c')
return 1;
return 0;
}
#endif /* CONFIG_SPL_OS_BOOT */
/* /*
* Routine: get_board_revision * Routine: get_board_revision
* Description: Detect if we are running on a Beagle revision Ax/Bx, * Description: Detect if we are running on a Beagle revision Ax/Bx,
......
configs/omap3_beagle_defconfig
+ 5
− 0
View file @ 4b37928d
...@@ -2,9 +2,11 @@ CONFIG_ARM=y ...@@ -2,9 +2,11 @@ CONFIG_ARM=y
CONFIG_ARCH_OMAP2PLUS=y CONFIG_ARCH_OMAP2PLUS=y
CONFIG_SYS_TEXT_BASE=0x80100000 CONFIG_SYS_TEXT_BASE=0x80100000
CONFIG_TARGET_OMAP3_BEAGLE=y CONFIG_TARGET_OMAP3_BEAGLE=y
CONFIG_DEFAULT_DEVICE_TREE="omap3-beagle"
CONFIG_DISTRO_DEFAULTS=y CONFIG_DISTRO_DEFAULTS=y
# CONFIG_USE_BOOTCOMMAND is not set # CONFIG_USE_BOOTCOMMAND is not set
CONFIG_SYS_CONSOLE_INFO_QUIET=y CONFIG_SYS_CONSOLE_INFO_QUIET=y
CONFIG_DEFAULT_FDT_FILE="omap3-beagle.dtb"
CONFIG_VERSION_VARIABLE=y CONFIG_VERSION_VARIABLE=y
CONFIG_SPL=y CONFIG_SPL=y
CONFIG_SPL_MTD_SUPPORT=y CONFIG_SPL_MTD_SUPPORT=y
...@@ -26,7 +28,9 @@ CONFIG_CMD_EXT4_WRITE=y ...@@ -26,7 +28,9 @@ CONFIG_CMD_EXT4_WRITE=y
CONFIG_CMD_MTDPARTS=y CONFIG_CMD_MTDPARTS=y
CONFIG_MTDIDS_DEFAULT="nand0=nand" CONFIG_MTDIDS_DEFAULT="nand0=nand"
CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)" CONFIG_MTDPARTS_DEFAULT="mtdparts=nand:512k(x-loader),1920k(u-boot),128k(u-boot-env),4m(kernel),-(fs)"
CONFIG_OF_CONTROL=y
CONFIG_ENV_IS_IN_NAND=y CONFIG_ENV_IS_IN_NAND=y
# CONFIG_BLK is not set
CONFIG_LED_STATUS=y CONFIG_LED_STATUS=y
CONFIG_LED_STATUS0=y CONFIG_LED_STATUS0=y
CONFIG_LED_STATUS_BIT=1 CONFIG_LED_STATUS_BIT=1
...@@ -59,4 +63,5 @@ CONFIG_USB_ETHER_ASIX=y ...@@ -59,4 +63,5 @@ CONFIG_USB_ETHER_ASIX=y
CONFIG_USB_ETHER_MCS7830=y CONFIG_USB_ETHER_MCS7830=y
CONFIG_USB_ETHER_SMSC95XX=y CONFIG_USB_ETHER_SMSC95XX=y
CONFIG_FAT_WRITE=y CONFIG_FAT_WRITE=y
CONFIG_BCH=y
CONFIG_OF_LIBFDT=y CONFIG_OF_LIBFDT=y
include/configs/omap3_beagle.h
+ 53
− 92
View file @ 4b37928d
...@@ -14,57 +14,69 @@ ...@@ -14,57 +14,69 @@
#define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */ #define CONFIG_NR_DRAM_BANKS 2 /* CS1 may or may not be populated */
#include <configs/ti_omap3_common.h>
/* /*
* 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM * We are only ever GP parts and will utilize all of the "downloaded image"
* 64 bytes before this address should be set aside for u-boot.img's * area in SRAM which starts at 0x40200000 and ends at 0x4020FFFF (64KB).
* header. That is 0x800FFFC0--0x80100000 should not be used for any
* other needs. We use this rather than the inherited defines from
* ti_armv7_common.h for backwards compatibility.
*/ */
#define CONFIG_SYS_TEXT_BASE 0x80100000 #undef CONFIG_SPL_TEXT_BASE
#define CONFIG_SPL_BSS_START_ADDR 0x80000000 #define CONFIG_SPL_TEXT_BASE 0x40200000
#define CONFIG_SPL_BSS_MAX_SIZE (512 << 10) /* 512 KB */
#define CONFIG_SYS_SPL_MALLOC_START 0x80208000
#define CONFIG_SYS_SPL_MALLOC_SIZE 0x100000
#include <configs/ti_omap3_common.h> #define CONFIG_SPL_FRAMEWORK
#define CONFIG_MISC_INIT_R #define CONFIG_MISC_INIT_R
#define CONFIG_CMDLINE_TAG
#define CONFIG_SETUP_MEMORY_TAGS
#define CONFIG_INITRD_TAG
#define CONFIG_REVISION_TAG
#define CONFIG_REVISION_TAG 1 /* 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_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 */
/* Status LED */ /* MUSB */
#define CONFIG_USB_OMAP3
/* Enable Multi Bus support for I2C */
#define CONFIG_I2C_MULTI_BUS 1
/* Probe all devices */
#define CONFIG_SYS_I2C_NOPROBES {{0x0, 0x0}}
/* USB */
#define CONFIG_USB_MUSB_OMAP2PLUS #define CONFIG_USB_MUSB_OMAP2PLUS
#define CONFIG_USB_MUSB_PIO_ONLY #define CONFIG_USB_MUSB_PIO_ONLY
#define CONFIG_TWL4030_USB 1 #define CONFIG_TWL4030_USB
/* USB EHCI */ /* USB EHCI */
#define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 147 #define CONFIG_OMAP_EHCI_PHY1_RESET_GPIO 147
/* commands to include */ /* Enable Multi Bus support for I2C */
#define CONFIG_I2C_MULTI_BUS
#define CONFIG_VIDEO_OMAP3 /* DSS Support */
/* /* DSS Support */
* TWL4030 #define CONFIG_VIDEO_OMAP3
*/
#define CONFIG_TWL4030_LED 1
/* /* TWL4030 LED Support */
* Board NAND Info. #define CONFIG_TWL4030_LED
*/
#define CONFIG_SYS_MAX_NAND_DEVICE 1 /* Max number of NAND */
/* devices */
#define BOOT_TARGET_DEVICES(func) \ #define BOOT_TARGET_DEVICES(func) \
func(MMC, mmc, 0) func(MMC, mmc, 0)
...@@ -91,6 +103,7 @@ ...@@ -91,6 +103,7 @@
"run bootscript; " \ "run bootscript; " \
"else " \ "else " \
"if run loadimage; then " \ "if run loadimage; then " \
"run loadfdt;" \
"run mmcboot;" \ "run mmcboot;" \
"fi;" \ "fi;" \
"fi; " \ "fi; " \
...@@ -105,13 +118,8 @@ ...@@ -105,13 +118,8 @@
#include <config_distro_bootcmd.h> #include <config_distro_bootcmd.h>
#define CONFIG_EXTRA_ENV_SETTINGS \ #define CONFIG_EXTRA_ENV_SETTINGS \
"loadaddr=0x80200000\0" \ DEFAULT_LINUX_BOOT_ENV \
"kernel_addr_r=0x80200000\0" \
"rdaddr=0x81000000\0" \
"initrd_addr_r=0x81000000\0" \
"fdt_high=0xffffffff\0" \ "fdt_high=0xffffffff\0" \
"fdtaddr=0x80f80000\0" \
"fdt_addr_r=0x80f80000\0" \
"usbtty=cdc_acm\0" \ "usbtty=cdc_acm\0" \
"bootfile=uImage\0" \ "bootfile=uImage\0" \
"ramdisk=ramdisk.gz\0" \ "ramdisk=ramdisk.gz\0" \
...@@ -127,7 +135,7 @@ ...@@ -127,7 +135,7 @@
"defaultdisplay=dvi\0" \ "defaultdisplay=dvi\0" \
"mmcdev=0\0" \ "mmcdev=0\0" \
"mmcroot=/dev/mmcblk0p2 rw\0" \ "mmcroot=/dev/mmcblk0p2 rw\0" \
"mmcrootfstype=ext3 rootwait\0" \ "mmcrootfstype=ext4 rootwait\0" \
"nandroot=ubi0:rootfs ubi.mtd=4\0" \ "nandroot=ubi0:rootfs ubi.mtd=4\0" \
"nandrootfstype=ubifs\0" \ "nandrootfstype=ubifs\0" \
"ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=0x81000000,64M\0" \ "ramroot=/dev/ram0 rw ramdisk_size=65536 initrd=0x81000000,64M\0" \
...@@ -190,10 +198,10 @@ ...@@ -190,10 +198,10 @@
"bootscript=echo Running bootscript from mmc${mmcdev} ...; " \ "bootscript=echo Running bootscript from mmc${mmcdev} ...; " \
"source ${loadaddr}\0" \ "source ${loadaddr}\0" \
"loadfdt=run validatefdt; load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \ "loadfdt=run validatefdt; load mmc ${bootpart} ${fdtaddr} ${bootdir}/${fdtfile}\0" \
"mmcboot=echo Booting from mmc ...; " \ "mmcboot=echo Booting ${bootfile} with DT from mmc${mmcdev} ...; " \
"run mmcargs; " \ "run mmcargs; " \
"bootm ${loadaddr}\0" \ "bootm ${loadaddr} - ${fdtaddr}\0" \
"mmcbootz=echo Booting with DT from mmc${mmcdev} ...; " \ "mmcbootz=echo Booting ${bootfile} with DT from mmc${mmcdev} ...; " \
"run mmcargs; " \ "run mmcargs; " \
"bootz ${loadaddr} - ${fdtaddr}\0" \ "bootz ${loadaddr} - ${fdtaddr}\0" \
"nandboot=echo Booting from nand ...; " \ "nandboot=echo Booting from nand ...; " \
...@@ -209,51 +217,4 @@ ...@@ -209,51 +217,4 @@
"userbutton_nonxm=gpio input 7;\0" \ "userbutton_nonxm=gpio input 7;\0" \
BOOTENV BOOTENV
/*
* OMAP3 has 12 GP timers, they can be driven by the system clock
* (12/13/16.8/19.2/38.4MHz) or by 32KHz clock. We use 13MHz (V_SCLK).
* This rate is divided by a local divisor.
*/
#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */
/*-----------------------------------------------------------------------
* FLASH and environment organization
*/
/* **** PISMO SUPPORT *** */
#if defined(CONFIG_CMD_NAND)
#define CONFIG_SYS_FLASH_BASE NAND_BASE
#endif
/* Monitor at start of flash */
#define CONFIG_SYS_MONITOR_BASE CONFIG_SYS_FLASH_BASE
#define CONFIG_SYS_ONENAND_BASE ONENAND_MAP
#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
#define ONENAND_ENV_OFFSET 0x260000 /* environment starts here */
#define CONFIG_SYS_ENV_SECT_SIZE (128 << 10) /* 128 KiB */
#define CONFIG_ENV_OFFSET 0x260000
#define CONFIG_ENV_ADDR 0x260000
/* Defines for SPL */
/* NAND boot config */
#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 0
#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_HAM1_CODE_HW
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
/* NAND: SPL falcon mode configs */
#ifdef CONFIG_SPL_OS_BOOT
#define CONFIG_SYS_NAND_SPL_KERNEL_OFFS 0x280000
#endif
#endif /* __CONFIG_H */ #endif /* __CONFIG_H */
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment