u-boot: upgraded to version 2014.01-rc3.
This commit is contained in:
parent
2aa9510159
commit
ebed4a1738
@ -2,7 +2,7 @@ source "$PKG_COMMON"
|
||||
|
||||
version=\
|
||||
(
|
||||
'2014.01-rc2'
|
||||
'2014.01-rc3'
|
||||
)
|
||||
|
||||
url=\
|
||||
@ -12,5 +12,5 @@ url=\
|
||||
|
||||
md5=\
|
||||
(
|
||||
'79601ecc47a71238295338af1f975f40'
|
||||
'f32ec4529a622a0b8619babf0e5f3c80'
|
||||
)
|
||||
|
@ -1,17 +0,0 @@
|
||||
--- u-boot-2013.01/board/ti/am335x/board.c 2013-01-15 21:47:42.000000000 +0000
|
||||
+++ u-boot-2013.01.rasm/board/ti/am335x/board.c 2013-04-09 18:39:45.938442622 +0100
|
||||
@@ -73,6 +73,14 @@
|
||||
return !strncmp(header.config, "SKU#02", 6);
|
||||
}
|
||||
|
||||
+#ifndef CONFIG_SYS_DCACHE_OFF
|
||||
+void enable_caches(void)
|
||||
+{
|
||||
+ /* Enable D-cache. I-cache is already enabled in start.S */
|
||||
+ dcache_enable();
|
||||
+}
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* Read header information from EEPROM into global structure.
|
||||
*/
|
@ -1,58 +0,0 @@
|
||||
--- a/include/configs/igep00x0.h
|
||||
+++ b/include/configs/igep00x0.h
|
||||
@@ -104,6 +104,8 @@
|
||||
/* commands to include */
|
||||
#include <config_cmd_default.h>
|
||||
|
||||
+#undef CONFIG_BOOT_ONENAND
|
||||
+
|
||||
#define CONFIG_CMD_CACHE
|
||||
#define CONFIG_CMD_EXT2 /* EXT2 Support */
|
||||
#define CONFIG_CMD_FAT /* FAT support */
|
||||
@@ -119,8 +121,8 @@
|
||||
#define CONFIG_CMD_DHCP
|
||||
#define CONFIG_CMD_PING
|
||||
#define CONFIG_CMD_NFS /* NFS support */
|
||||
-#define CONFIG_CMD_MTDPARTS /* Enable MTD parts commands */
|
||||
-#define CONFIG_MTD_DEVICE
|
||||
+/* #define CONFIG_CMD_MTDPARTS /\* Enable MTD parts commands *\/ */
|
||||
+/* #define CONFIG_MTD_DEVICE */
|
||||
|
||||
#undef CONFIG_CMD_FLASH /* flinfo, erase, protect */
|
||||
#undef CONFIG_CMD_IMLS /* List all found images */
|
||||
@@ -142,6 +144,7 @@
|
||||
#define CONFIG_ZERO_BOOTDELAY_CHECK
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
+ "bootfile=uImage\0" \
|
||||
"usbtty=cdc_acm\0" \
|
||||
"loadaddr=0x82000000\0" \
|
||||
"usbtty=cdc_acm\0" \
|
||||
@@ -150,7 +153,7 @@
|
||||
"vram=12M\0" \
|
||||
"dvimode=1024x768MR-16@60\0" \
|
||||
"defaultdisplay=dvi\0" \
|
||||
- "mmcdev=0\0" \
|
||||
+ "mmcdev=0:1\0" \
|
||||
"mmcroot=/dev/mmcblk0p2 rw\0" \
|
||||
"mmcrootfstype=ext4 rootwait\0" \
|
||||
"nandroot=/dev/mtdblock4 rw\0" \
|
||||
@@ -174,7 +177,7 @@
|
||||
"loadbootenv=fatload mmc ${mmcdev} ${loadaddr} uEnv.txt\0" \
|
||||
"importbootenv=echo Importing environment from mmc ...; " \
|
||||
"env import -t $loadaddr $filesize\0" \
|
||||
- "loaduimage=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
|
||||
+ "loaduimage=ext2load mmc ${mmcdev} ${loadaddr} ${bootfile}\0" \
|
||||
"mmcboot=echo Booting from mmc ...; " \
|
||||
"run mmcargs; " \
|
||||
"bootm ${loadaddr}\0" \
|
||||
@@ -234,6 +237,9 @@
|
||||
#define CONFIG_SYS_PTV 2 /* Divisor: 2^(PTV+1) => 8 */
|
||||
#define CONFIG_SYS_HZ 1000
|
||||
|
||||
+#define CONFIG_ENV_IS_NOWHERE
|
||||
+#define CONFIG_ENV_SIZE (512 << 10) /* Total Size Environment */
|
||||
+
|
||||
/*
|
||||
* Physical Memory Map
|
||||
*
|
@ -1,56 +0,0 @@
|
||||
--- u-boot-2013.01/include/configs/am335x_evm.h 2013-01-15 21:47:42.000000000 +0000
|
||||
+++ u-boot-2013.01.rasm/include/configs/am335x_evm.h 2013-04-09 18:25:22.027878365 +0100
|
||||
@@ -46,7 +46,9 @@
|
||||
#define CONFIG_VERSION_VARIABLE
|
||||
|
||||
/* set to negative value for no autoboot */
|
||||
-#define CONFIG_BOOTDELAY 1
|
||||
+#define CONFIG_BOOTDELAY 0
|
||||
+#define CONFIG_ZERO_BOOTDELAY_CHECK
|
||||
+
|
||||
#define CONFIG_ENV_VARS_UBOOT_CONFIG
|
||||
#define CONFIG_ENV_VARS_UBOOT_RUNTIME_CONFIG
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
@@ -241,6 +243,7 @@
|
||||
#define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
|
||||
|
||||
#define CONFIG_SPL_BOARD_INIT
|
||||
+#if 0
|
||||
#define CONFIG_SPL_NAND_AM33XX_BCH
|
||||
#define CONFIG_SPL_NAND_SUPPORT
|
||||
#define CONFIG_SPL_NAND_BASE
|
||||
@@ -271,6 +274,7 @@
|
||||
#define CONFIG_SYS_NAND_U_BOOT_START CONFIG_SYS_TEXT_BASE
|
||||
|
||||
#define CONFIG_SYS_NAND_U_BOOT_OFFS 0x80000
|
||||
+#endif
|
||||
|
||||
/*
|
||||
* 1MB into the SDRAM to allow for SPL's bss at the beginning of SDRAM
|
||||
@@ -292,6 +296,7 @@
|
||||
/*
|
||||
* USB configuration
|
||||
*/
|
||||
+#if 0
|
||||
#define CONFIG_USB_MUSB_DSPS
|
||||
#define CONFIG_ARCH_MISC_INIT
|
||||
#define CONFIG_MUSB_GADGET
|
||||
@@ -302,6 +307,7 @@
|
||||
#define CONFIG_AM335X_USB0_MODE MUSB_PERIPHERAL
|
||||
#define CONFIG_AM335X_USB1
|
||||
#define CONFIG_AM335X_USB1_MODE MUSB_HOST
|
||||
+#endif
|
||||
|
||||
#ifdef CONFIG_MUSB_HOST
|
||||
#define CONFIG_CMD_USB
|
||||
@@ -334,7 +340,9 @@
|
||||
#define CONFIG_PHY_ADDR 0
|
||||
#define CONFIG_PHY_SMSC
|
||||
|
||||
-#define CONFIG_NAND
|
||||
+#undef CONFIG_NAND
|
||||
+#define CONFIG_ENV_SIZE (128 << 10) /* 128 KiB */
|
||||
+
|
||||
/* NAND support */
|
||||
#ifdef CONFIG_NAND
|
||||
#define CONFIG_CMD_NAND
|
@ -1,14 +0,0 @@
|
||||
diff -Nru u-boot-2013.01.01/board/isee/igep0020/igep0020.h u-boot-2013.01.01.rasm/board/isee/igep0020/igep0020.h
|
||||
--- u-boot-2013.01.01/board/isee/igep0020/igep0020.h 2013-01-31 19:47:42.000000000 +0000
|
||||
+++ u-boot-2013.01.01.rasm/board/isee/igep0020/igep0020.h 2013-06-24 01:56:54.066266486 +0100
|
||||
@@ -146,6 +146,10 @@
|
||||
MUX_VAL(CP(SYS_BOOT4), (IEN | PTD | DIS | M4)) /* GPIO_6 */\
|
||||
MUX_VAL(CP(SYS_BOOT5), (IEN | PTD | DIS | M4)) /* GPIO_7 */\
|
||||
MUX_VAL(CP(SYS_BOOT6), (IEN | PTD | DIS | M4)) /* GPIO_8 */\
|
||||
+ MUX_VAL(CP(MCBSP2_FSX), (IEN | PTD | DIS | M0)) /*McBSP2_FSX*/\
|
||||
+ MUX_VAL(CP(MCBSP2_CLKX), (IEN | PTD | DIS | M0)) /*McBSP2_CLKX*/\
|
||||
+ MUX_VAL(CP(MCBSP2_DR), (IEN | PTD | DIS | M0)) /*McBSP2_DR*/\
|
||||
+ MUX_VAL(CP(MCBSP2_DX), (IDIS | PTD | DIS | M0)) /*McBSP2_DX*/\
|
||||
MUX_VAL(CP(SDRC_CKE0), (IDIS | PTU | EN | M0)) /* SDRC_CKE0 */\
|
||||
MUX_VAL(CP(SDRC_CKE1), (IDIS | PTU | EN | M0)) /* SDRC_CKE1 */
|
||||
#endif
|
@ -1,12 +0,0 @@
|
||||
--- a/include/configs/igep00x0.h
|
||||
+++ b/include/configs/igep00x0.h
|
||||
@@ -138,7 +138,8 @@
|
||||
*/
|
||||
#define CONFIG_TWL4030_POWER 1
|
||||
|
||||
-#define CONFIG_BOOTDELAY 3
|
||||
+#define CONFIG_BOOTDELAY 0
|
||||
+#define CONFIG_ZERO_BOOTDELAY_CHECK
|
||||
|
||||
#define CONFIG_EXTRA_ENV_SETTINGS \
|
||||
"usbtty=cdc_acm\0" \
|
Reference in New Issue
Block a user