diff options
| author | Evan Wilson <evan@oliodevices.com> | 2014-03-31 17:47:37 -0700 |
|---|---|---|
| committer | Evan Wilson <evan@oliodevices.com> | 2014-03-31 17:47:37 -0700 |
| commit | 79c474e34227364895d4b195692f136cf486983c (patch) | |
| tree | e387ca78490ee1fd8374d67ab6ab8228902dddca | |
| parent | 98eaff30765bd4cce711e594034d01238354464a (diff) | |
| download | olio-uboot-2014.01-79c474e34227364895d4b195692f136cf486983c.tar.xz olio-uboot-2014.01-79c474e34227364895d4b195692f136cf486983c.zip | |
Working with MMC->UART3 boot config
| -rw-r--r-- | .gitignore | 4 | ||||
| -rw-r--r-- | board/olio/h1/h1.c | 2 | ||||
| -rw-r--r-- | config.mk | 2 | ||||
| -rw-r--r-- | include/common.h | 1 | ||||
| -rw-r--r-- | include/configs/omap3_h1.h | 28 |
5 files changed, 12 insertions, 25 deletions
diff --git a/.gitignore b/.gitignore index a39bd54d3..14cdea38b 100644 --- a/.gitignore +++ b/.gitignore @@ -18,6 +18,10 @@ *.cfgtmp *.dts.tmp +# TI CCS project ignores +.cproject +.project + # Build tree /build-* diff --git a/board/olio/h1/h1.c b/board/olio/h1/h1.c index c9350347f..ffdf30c8d 100644 --- a/board/olio/h1/h1.c +++ b/board/olio/h1/h1.c @@ -13,6 +13,8 @@ * * SPDX-License-Identifier: GPL-2.0+ */ +// DEBUG +#define DEBUG #include <common.h> #include <linux/mtd/nand.h> #include <asm/io.h> @@ -203,7 +203,7 @@ endif # who are porting old code to latest mainline but not updating $(AR). ARFLAGS = $(error update your Makefile to use cmd_link_o_target and not AR) RELFLAGS= $(PLATFORM_RELFLAGS) -DBGFLAGS= -g # -DDEBUG +DBGFLAGS= -g -DDEBUG OPTFLAGS= -Os #-fomit-frame-pointer OBJCFLAGS += --gap-fill=0xff diff --git a/include/common.h b/include/common.h index 409515f49..2202d3948 100644 --- a/include/common.h +++ b/include/common.h @@ -99,6 +99,7 @@ typedef volatile unsigned char vu_char; #include <flash.h> #include <image.h> +#define DEBUG #ifdef DEBUG #define _DEBUG 1 #else diff --git a/include/configs/omap3_h1.h b/include/configs/omap3_h1.h index 8f57a72c5..169079781 100644 --- a/include/configs/omap3_h1.h +++ b/include/configs/omap3_h1.h @@ -32,13 +32,13 @@ #define CONFIG_DISPLAY_BOARDINFO 1 /* Clock Defines */ -#define V_OSCK 26000000 /* Clock output from T2 */ +#define V_OSCK 12000000 /* Clock output from T2 */ #define V_SCLK (V_OSCK >> 1) -#define CONFIG_MISC_INIT_R +#define CONFIG_MISC_INIT_R /* misc_init_r() function for platform */ -#define CONFIG_OF_LIBFDT -#define CONFIG_CMD_BOOTZ +#define CONFIG_OF_LIBFDT /* FDT support */ +#define CONFIG_CMD_BOOTZ /* zImage support */ #define CONFIG_CMDLINE_TAG 1 /* enable passing of ATAGs */ #define CONFIG_SETUP_MEMORY_TAGS 1 @@ -267,14 +267,12 @@ CONFIG_SYS_INIT_RAM_SIZE - \ GENERATED_GBL_DATA_SIZE) -#define CONFIG_OMAP3_SPI #define CONFIG_SYS_CACHELINE_SIZE 64 /* Defines for SPL */ #define CONFIG_SPL #define CONFIG_SPL_FRAMEWORK -#define CONFIG_SPL_NAND_SIMPLE #define CONFIG_SPL_TEXT_BASE 0x40200800 #define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */ #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK @@ -288,29 +286,11 @@ #define CONFIG_SPL_I2C_SUPPORT #define CONFIG_SPL_LIBGENERIC_SUPPORT #define CONFIG_SPL_SERIAL_SUPPORT -#define CONFIG_SPL_NAND_SUPPORT -#define CONFIG_SPL_NAND_BASE -#define CONFIG_SPL_NAND_DRIVERS -#define CONFIG_SPL_NAND_ECC #define CONFIG_SPL_GPIO_SUPPORT #define CONFIG_SPL_POWER_SUPPORT #define CONFIG_SPL_OMAP3_ID_NAND #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds" -/* NAND boot config */ -#define CONFIG_SYS_NAND_5_ADDR_CYCLE -#define CONFIG_SYS_NAND_PAGE_COUNT 64 -#define CONFIG_SYS_NAND_PAGE_SIZE 1024 -#define CONFIG_SYS_NAND_OOBSIZE 32 -#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_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE -#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000 - /* * 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM * 64 bytes before this address should be set aside for u-boot.img's |