diff --git a/arch/arm/cpu/armv7/omap-common/spl.c b/arch/arm/cpu/armv7/omap-common/spl.c index c614602..7f38772 100644 --- a/arch/arm/cpu/armv7/omap-common/spl.c +++ b/arch/arm/cpu/armv7/omap-common/spl.c @@ -119,7 +119,7 @@ void board_init_r(gd_t *id, ulong dummy) #endif boot_device = omap_boot_device(); - debug("boot device - %d\n", boot_device); + printf("boot device - %d\n", boot_device); switch (boot_device) { #ifdef CONFIG_SPL_MMC_SUPPORT case BOOT_DEVICE_MMC1: diff --git a/arch/arm/include/asm/arch-ti81xx/mem.h b/arch/arm/include/asm/arch-ti81xx/mem.h index 0ceb073..7c2124e 100644 --- a/arch/arm/include/asm/arch-ti81xx/mem.h +++ b/arch/arm/include/asm/arch-ti81xx/mem.h @@ -97,7 +97,7 @@ enum { #ifdef CONFIG_AM335X /* SA 8-Bit Nand */ -#define M_NAND_GPMC_CONFIG1 0x00000800 +#define M_NAND_GPMC_CONFIG1 0x00001810 //0x00001810 /* 16 bit Nand */ #else #define M_NAND_GPMC_CONFIG1 0x00001810 #endif diff --git a/board/ti/am335x/evm.c b/board/ti/am335x/evm.c index 19ccaa7..c62cb12 100644 --- a/board/ti/am335x/evm.c +++ b/board/ti/am335x/evm.c @@ -404,6 +404,7 @@ static void rtc32k_enable(void) */ int read_eeprom(void) { +#if 0 /* Check if baseboard eeprom is available */ if (i2c_probe(I2C_BASE_BOARD_ADDR)) { printf("Could not probe the EEPROM; something fundamentally " @@ -434,6 +435,25 @@ int read_eeprom(void) } } return 0; +#else + +header.magic = 0xEE3355AA; +strncpy(header.name, "A33515BB", strlen("A33515BB")); +strncpy(header.version, "1.1A", strlen("1.1A")); +strncpy(header.serial, "52114P160063", strlen("52114P160063")); +#if 0 +strncpy(header.config, "SKU#01", strlen("SKU#01")); +#else +strncpy(header.config, "A335X_SK", strlen("A335X_SK")); +#endif +#if 0 + printf("\tBoard name : %.8s\n", header.name); + printf("\tBoard version: %.4s\n", header.version); + printf("\tBoard serial : %.12s\n", header.serial); + printf("\tBoard config : %.8s\n\n", header.config); +#endif + return 0; +#endif } #if defined(CONFIG_SPL_BUILD) && defined(CONFIG_SPL_BOARD_INIT) @@ -708,7 +728,7 @@ void s_init(void) printf("read_eeprom() failure. continuing with ddr3\n"); } - u32 is_ddr3 = 0; + u32 is_ddr3 = 1; if (!strncmp("A335X_SK", header.name, 8)) { is_ddr3 = 1; @@ -724,10 +744,12 @@ void s_init(void) if(is_ddr3 == 1){ ddr_pll_config(303); config_am335x_ddr3(); +printf(" DDR3\n"); } else { ddr_pll_config(266); config_am335x_ddr2(); +printf(" DDR2\n"); } #endif @@ -799,7 +821,7 @@ int board_init(void) if (read_eeprom()) goto err_out; - +#if 0 detect_daughter_board(); if (!strncmp("SKU#01", header.config, 6)) { @@ -826,7 +848,12 @@ int board_init(void) profile = 1; /* profile 0 is internally considered as 1 */ daughter_board_connected = 1; } - +#else +printf("Test\n"); + board_id = SK_BOARD; + profile = 1; /* profile 0 is internally considered as 1 */ + daughter_board_connected = 0; +#endif configure_evm_pin_mux(board_id, header.version, profile, daughter_board_connected); #ifndef CONFIG_SPL_BUILD diff --git a/board/ti/am335x/mux.c b/board/ti/am335x/mux.c index 81e87a8..b564aa2 100644 --- a/board/ti/am335x/mux.c +++ b/board/ti/am335x/mux.c @@ -286,6 +286,14 @@ static struct module_pin_mux nand_pin_mux[] = { {OFFSET(gpmc_ad5), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD5 */ {OFFSET(gpmc_ad6), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD6 */ {OFFSET(gpmc_ad7), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD7 */ + {OFFSET(gpmc_ad8), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD8 */ + {OFFSET(gpmc_ad9), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND AD9 */ + {OFFSET(gpmc_ad10), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND_AD10 */ + {OFFSET(gpmc_ad11), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND_AD11 */ + {OFFSET(gpmc_ad12), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND_AD12 */ + {OFFSET(gpmc_ad13), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND_AD13 */ + {OFFSET(gpmc_ad14), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND_AD14 */ + {OFFSET(gpmc_ad15), (MODE(0) | PULLUP_EN | RXACTIVE)}, /* NAND_AD15 */ {OFFSET(gpmc_wait0), (MODE(0) | RXACTIVE | PULLUP_EN)}, /* NAND WAIT */ {OFFSET(gpmc_wpn), (MODE(7) | PULLUP_EN | RXACTIVE)}, /* NAND_WPN */ {OFFSET(gpmc_csn0), (MODE(0) | PULLUDEN)}, /* NAND_CS0 */ diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h index 44a8500..ceb9701 100755 --- a/include/configs/am335x_evm.h +++ b/include/configs/am335x_evm.h @@ -123,6 +123,15 @@ "tftp ${kloadaddr} ${bootfile}; " \ "run net_args; " \ "bootm ${kloadaddr}\0" \ + "fx=mmc rescan; nand erase 0x0 0x280000; nandecc hw 2; " \ + "fatload mmc 0 0x81000000 MLO; nand write 0x81000000 0x0 0x20000; nand write 0x81000000 0x20000 0x20000;\0" \ + "fu=mmc rescan; nand erase 0x80000 0x001E0000; " \ + "fatload mmc 0 0x81000000 u-boot.img; nand write 0x81000000 0x80000 0x1E0000; \0" \ + "fk=mmc rescan; nand erase 0x280000 0x500000; nandecc hw 2; " \ + "fatload mmc 0 0x81000000 uImage; nand write 0x81000000 0x280000 0x500000; \0" \ + "fr=mw.b 0x82000000 0xFF 0x1300000; mmc rescan; nand erase 0x780000 0xF880000; nandecc hw 2; " \ + "fatload mmc 0 0x82000000 ubi.img; nand write 0x82000000 0x780000 0x1300000; \0" \ + "fall=run fx;run fu;run fk;run fr; \0" #ifndef CONFIG_RESTORE_FLASH /* set to negative value for no autoboot */