mirror of
https://git.yoctoproject.org/meta-ti
synced 2026-05-09 04:50:45 +00:00
u-boot 2011.10rc: update SRCREV and rediff patches
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
This commit is contained in:
Koen Kooi
+35
@@ -0,0 +1,35 @@
|
||||
From 557a773eb245f3f2508e40d6d8a6c593738fd46f Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Tue, 1 Nov 2011 12:19:54 +0100
|
||||
Subject: [PATCH 1/4] am335x_evm: only do in-kernel dhcp when using NFS, userspace will do dhcp otherwise
|
||||
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
include/configs/am335x_evm.h | 4 ++--
|
||||
1 files changed, 2 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
|
||||
index 41a3316..93b3161 100755
|
||||
--- a/include/configs/am335x_evm.h
|
||||
+++ b/include/configs/am335x_evm.h
|
||||
@@ -69,7 +69,7 @@
|
||||
"nfsopts=nolock\0" \
|
||||
"static_ip=${ipaddr}:${serverip}:${gatewayip}:${netmask}:${hostname}" \
|
||||
"::off\0" \
|
||||
- "ip_method=dhcp\0" \
|
||||
+ "ip_method=none\0" \
|
||||
"bootenv=uEnv.txt\0" \
|
||||
"loadbootenv=fatload mmc ${mmc_dev} ${loadaddr} ${bootenv}\0" \
|
||||
"importbootenv=echo Importing environment from mmc ...; " \
|
||||
@@ -99,7 +99,7 @@
|
||||
"setenv bootargs ${bootargs} " \
|
||||
"root=/dev/nfs " \
|
||||
"nfsroot=${serverip}:${rootpath},${nfsopts} rw " \
|
||||
- "ip=${ip_method}\0" \
|
||||
+ "ip=dhcp\0" \
|
||||
"mmc_boot=run mmc_args; " \
|
||||
"run mmc_load_uimage; " \
|
||||
"bootm ${loadaddr}\0" \
|
||||
--
|
||||
1.7.2.5
|
||||
|
||||
-47
@@ -1,47 +0,0 @@
|
||||
From ec41c3f94a9a498d1f7061abd98e41a66c0ab13e Mon Sep 17 00:00:00 2001
|
||||
From: Steve Kipisz <s-kipisz2@ti.com>
|
||||
Date: Thu, 13 Oct 2011 14:42:35 -0500
|
||||
Subject: [PATCH 1/4] mach-types: Add new beaglebone machine type.
|
||||
|
||||
* New machine type is 3808
|
||||
|
||||
Signed-off-by: Steve Kipisz <s-kipisz2@ti.com>
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
arch/arm/include/asm/mach-types.h | 13 +++++++++++++
|
||||
1 files changed, 13 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/arch/arm/include/asm/mach-types.h b/arch/arm/include/asm/mach-types.h
|
||||
index c6ea523..68ac2ba 100644
|
||||
--- a/arch/arm/include/asm/mach-types.h
|
||||
+++ b/arch/arm/include/asm/mach-types.h
|
||||
@@ -3314,6 +3314,7 @@ extern unsigned int __machine_arch_type;
|
||||
#define MACH_TYPE_GOFLEXHOME 3338
|
||||
#define MACH_TYPE_TIAM335EVM 3589
|
||||
#define MACH_TYPE_TIAM335IAEVM 3684
|
||||
+#define MACH_TYPE_BEAGLEBONE 3808
|
||||
|
||||
#ifdef CONFIG_ARCH_EBSA110
|
||||
# ifdef machine_arch_type
|
||||
@@ -42927,6 +42928,18 @@ extern unsigned int __machine_arch_type;
|
||||
# define machine_is_tiam335evm() (0)
|
||||
#endif
|
||||
|
||||
+#ifdef CONFIG_MACH_BEAGLEBONE
|
||||
+# ifdef machine_arch_type
|
||||
+# undef machine_arch_type
|
||||
+# define machine_arch_type __machine_arch_type
|
||||
+# else
|
||||
+# define machine_arch_type MACH_TYPE_BEAGLEBONE
|
||||
+# endif
|
||||
+# define machine_is_beaglebone() (machine_arch_type == MACH_TYPE_BEAGLEBONE)
|
||||
+#else
|
||||
+# define machine_is_beaglebone() (0)
|
||||
+#endif
|
||||
+
|
||||
/*
|
||||
* These have not yet been registered
|
||||
*/
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
+7
-7
@@ -1,7 +1,7 @@
|
||||
From 30c5198d37863d4f1598f7fe2b8f690b6cf6ae53 Mon Sep 17 00:00:00 2001
|
||||
From 206baf5d1d8eb19312c0c8216e6722a63548573d Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Thu, 13 Oct 2011 12:15:25 +0200
|
||||
Subject: [PATCH 1/2] am335x_evm: boot kernel from ext2/3 filesystem
|
||||
Date: Tue, 1 Nov 2011 12:21:07 +0100
|
||||
Subject: [PATCH 2/4] am335x_evm: boot kernel from /boot in ext2/3 filesystem
|
||||
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
@@ -9,7 +9,7 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
1 files changed, 2 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
|
||||
index f1cc2b2..9ce360d 100755
|
||||
index 93b3161..9bbfe3b 100755
|
||||
--- a/include/configs/am335x_evm.h
|
||||
+++ b/include/configs/am335x_evm.h
|
||||
@@ -74,7 +74,8 @@
|
||||
@@ -19,9 +19,9 @@ index f1cc2b2..9ce360d 100755
|
||||
- "mmc_load_uimage=fatload mmc ${mmc_dev} ${loadaddr} ${bootfile}\0" \
|
||||
+ "mmc_load_uimage_fat=fatload mmc ${mmc_dev} ${loadaddr} ${bootfile}\0" \
|
||||
+ "mmc_load_uimage=ext2load mmc 0:2 ${loadaddr} /boot/${bootfile}\0" \
|
||||
"optargs=\0" \
|
||||
"bootargs_defaults=setenv bootargs " \
|
||||
"console=${console}\0" \
|
||||
"mmc_args=run bootargs_defaults;" \
|
||||
"console=${console} " \
|
||||
--
|
||||
1.6.6.1
|
||||
1.7.2.5
|
||||
|
||||
-29
@@ -1,29 +0,0 @@
|
||||
From 17c0530b1539fb8813efc11c60dd87fd9a3a074b Mon Sep 17 00:00:00 2001
|
||||
From: Steve Kipisz <s-kipisz2@ti.com>
|
||||
Date: Thu, 13 Oct 2011 16:31:26 -0500
|
||||
Subject: [PATCH 2/4] evm: If beaglebone is detected, pass the MACH_TYPE_BEAGLEBONE to Linux
|
||||
|
||||
Signed-off-by: Steve Kipisz <s-kipisz2@ti.com>
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
board/ti/am335x/evm.c | 4 +++-
|
||||
1 files changed, 3 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/board/ti/am335x/evm.c b/board/ti/am335x/evm.c
|
||||
index 95e790b..af34bfd 100755
|
||||
--- a/board/ti/am335x/evm.c
|
||||
+++ b/board/ti/am335x/evm.c
|
||||
@@ -447,7 +447,9 @@ static void detect_daughter_board_profile(void)
|
||||
int board_evm_init(void)
|
||||
{
|
||||
/* mach type passed to kernel */
|
||||
- if (board_id == IA_BOARD)
|
||||
+ if (board_id == BONE_BOARD)
|
||||
+ gd->bd->bi_arch_number = MACH_TYPE_BEAGLEBONE;
|
||||
+ else if (board_id == IA_BOARD)
|
||||
gd->bd->bi_arch_number = MACH_TYPE_TIAM335IAEVM;
|
||||
else
|
||||
gd->bd->bi_arch_number = MACH_TYPE_TIAM335EVM;
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
+5
-5
@@ -1,7 +1,7 @@
|
||||
From 481457db4fe870fcbab47fe29cb768daf235fd1f Mon Sep 17 00:00:00 2001
|
||||
From bf513a05bc37f6d32e14c1e46d090773d1664c99 Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Thu, 13 Oct 2011 12:17:27 +0200
|
||||
Subject: [PATCH 2/2] am335x_evm: set bootdelay to 1
|
||||
Date: Tue, 1 Nov 2011 12:21:38 +0100
|
||||
Subject: [PATCH 3/4] am335x_evm: set bootdelay to 1
|
||||
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
@@ -9,7 +9,7 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
|
||||
index 9ce360d..78c823b 100755
|
||||
index 9bbfe3b..6143dc3 100755
|
||||
--- a/include/configs/am335x_evm.h
|
||||
+++ b/include/configs/am335x_evm.h
|
||||
@@ -38,7 +38,7 @@
|
||||
@@ -22,5 +22,5 @@ index 9ce360d..78c823b 100755
|
||||
#define CONFIG_MMC
|
||||
#define CONFIG_NAND
|
||||
--
|
||||
1.6.6.1
|
||||
1.7.2.5
|
||||
|
||||
-46
@@ -1,46 +0,0 @@
|
||||
From 52165b34c2fbcfe93f4cfabb616c2feb3ea7344f Mon Sep 17 00:00:00 2001
|
||||
From: Jason Kridner <jdk@ti.com>
|
||||
Date: Thu, 13 Oct 2011 23:50:35 -0400
|
||||
Subject: [PATCH 3/4] am335x_evm: single-byte address EEPROM for board identifier
|
||||
|
||||
The BeagleBone has an EEPROM that uses a single byte address instead of a
|
||||
2-byte address used by the EVM versions. This simply adds a quick attempt
|
||||
at reading the board identifier header with a 1-byte address if the header
|
||||
signature isn't correct using a 2-byte address.
|
||||
|
||||
This is only build tested. Having a script to program the expected EEPROM
|
||||
contents would help me reduce my time to test this.
|
||||
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
board/ti/am335x/evm.c | 14 ++++++++++++--
|
||||
1 files changed, 12 insertions(+), 2 deletions(-)
|
||||
|
||||
diff --git a/board/ti/am335x/evm.c b/board/ti/am335x/evm.c
|
||||
index af34bfd..f484a3c 100755
|
||||
--- a/board/ti/am335x/evm.c
|
||||
+++ b/board/ti/am335x/evm.c
|
||||
@@ -496,8 +496,18 @@ int board_init(void)
|
||||
}
|
||||
|
||||
if (header.magic != 0xEE3355AA) {
|
||||
- printf("Incorrect magic number in EEPROM\n");
|
||||
- goto err_out;
|
||||
+ /* read the eeprom using i2c again, but use only a 1 byte address */
|
||||
+ if (i2c_read(I2C_BASE_BOARD_ADDR, 0, 1, (uchar *)&header,
|
||||
+ sizeof(header))) {
|
||||
+ printf("Could not read the EEPROM; something fundamentally"
|
||||
+ " wrong on the I2C bus.\n");
|
||||
+ goto err_out;
|
||||
+ }
|
||||
+
|
||||
+ if (header.magic != 0xEE3355AA) {
|
||||
+ printf("Incorrect magic number in EEPROM\n");
|
||||
+ goto err_out;
|
||||
+ }
|
||||
}
|
||||
|
||||
detect_daughter_board();
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
-40
@@ -1,40 +0,0 @@
|
||||
From 3e3ac90cdd7fade62e898453f529364e4d9c7589 Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Tue, 18 Oct 2011 19:18:56 +0200
|
||||
Subject: [PATCH 4/4] am335x-evm: fall back to bone if header.config is empty
|
||||
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
board/ti/am335x/evm.c | 8 ++++----
|
||||
1 files changed, 4 insertions(+), 4 deletions(-)
|
||||
|
||||
diff --git a/board/ti/am335x/evm.c b/board/ti/am335x/evm.c
|
||||
index f484a3c..1c3ba2c 100755
|
||||
--- a/board/ti/am335x/evm.c
|
||||
+++ b/board/ti/am335x/evm.c
|
||||
@@ -495,6 +495,7 @@ int board_init(void)
|
||||
goto err_out;
|
||||
}
|
||||
|
||||
+ printf("EEPROM ID:\n magic: %#08x\n name: %8s\n version: %4s\n serial: %12s\n config: %32s\n mac_addr: %s\n", header.magic, header.name, header.version, header.serial, header.config, header.mac_addr);
|
||||
if (header.magic != 0xEE3355AA) {
|
||||
/* read the eeprom using i2c again, but use only a 1 byte address */
|
||||
if (i2c_read(I2C_BASE_BOARD_ADDR, 0, 1, (uchar *)&header,
|
||||
@@ -522,11 +523,10 @@ int board_init(void)
|
||||
board_id = IPP_BOARD;
|
||||
} else {
|
||||
printf("Did not find a recognized configuration, "
|
||||
- "assuming General purpose EVM in Profile 0 with "
|
||||
- "Daughter board\n");
|
||||
- board_id = GP_BOARD;
|
||||
+ "assuming BeagleBone\n");
|
||||
+ board_id = BONE_BOARD;
|
||||
profile = 1; /* profile 0 is internally considered as 1 */
|
||||
- daughter_board_connected = 1;
|
||||
+ daughter_board_connected = 0;
|
||||
}
|
||||
|
||||
configure_evm_pin_mux(board_id, profile, daughter_board_connected);
|
||||
--
|
||||
1.6.6.1
|
||||
|
||||
+5
-5
@@ -1,7 +1,7 @@
|
||||
From 9f8585887a08e6a9c7ca24c2a9c0e9a8c66a2a54 Mon Sep 17 00:00:00 2001
|
||||
From 63e5b3b4271917e0a3c5a4903a76fdfb30118d3c Mon Sep 17 00:00:00 2001
|
||||
From: Koen Kooi <koen@dominion.thruhere.net>
|
||||
Date: Sun, 16 Oct 2011 09:57:06 +0200
|
||||
Subject: [PATCH 3/3] am335x-evm: make rootfs RO on boot
|
||||
Date: Tue, 1 Nov 2011 12:22:30 +0100
|
||||
Subject: [PATCH 4/4] am335x-evm: make MMC rootfs RO on boot so fsck works
|
||||
|
||||
Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
---
|
||||
@@ -9,7 +9,7 @@ Signed-off-by: Koen Kooi <koen@dominion.thruhere.net>
|
||||
1 files changed, 1 insertions(+), 1 deletions(-)
|
||||
|
||||
diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
|
||||
index cb45037..5db3d9f 100755
|
||||
index 6143dc3..56e36da 100755
|
||||
--- a/include/configs/am335x_evm.h
|
||||
+++ b/include/configs/am335x_evm.h
|
||||
@@ -50,7 +50,7 @@
|
||||
@@ -22,5 +22,5 @@ index cb45037..5db3d9f 100755
|
||||
"spi_root=/dev/mtdblock4 rw\0" \
|
||||
"nor_root=/dev/mtdblock3 rw\0" \
|
||||
--
|
||||
1.6.6.1
|
||||
1.7.2.5
|
||||
|
||||
-28
@@ -1,28 +0,0 @@
|
||||
From 186250ee6abca3f080b5321504a1c5881ffbf7c6 Mon Sep 17 00:00:00 2001
|
||||
From: Joel A Fernandes <joelagnel@ti.com>
|
||||
Date: Thu, 20 Oct 2011 19:46:53 -0500
|
||||
Subject: [PATCH] am335x-evm: Read name field in EEPROM header for BeagleBoard bone detection
|
||||
|
||||
Signed-off-by: Joel A Fernandes <joelagnel@ti.com>
|
||||
---
|
||||
board/ti/am335x/evm.c | 4 ++++
|
||||
1 files changed, 4 insertions(+), 0 deletions(-)
|
||||
|
||||
diff --git a/board/ti/am335x/evm.c b/board/ti/am335x/evm.c
|
||||
index 37e348f..b63dcbe 100755
|
||||
--- a/board/ti/am335x/evm.c
|
||||
+++ b/board/ti/am335x/evm.c
|
||||
@@ -501,6 +501,10 @@ int board_init(void)
|
||||
detect_daughter_board_profile();
|
||||
} else if (!strncmp("SKU#03", header.config, 6)) {
|
||||
board_id = IPP_BOARD;
|
||||
+ } else if (!strncmp("A335BONE", header.name, 8)) {
|
||||
+ board_id = BONE_BOARD;
|
||||
+ profile = 1; /* profile 0 is internally considered as 1 */
|
||||
+ daughter_board_connected = 0;
|
||||
} else {
|
||||
printf("Did not find a recognized configuration, "
|
||||
"assuming BeagleBone\n");
|
||||
--
|
||||
1.7.1
|
||||
|
||||
@@ -4,7 +4,7 @@ require u-boot.inc
|
||||
COMPATIBLE_MACHINE = "(ti33x)"
|
||||
DEFAULT_PREFERENCE_ti33x = "99"
|
||||
PV = "2011.09+git"
|
||||
PR = "r15"
|
||||
PR = "r16"
|
||||
|
||||
# SPL build
|
||||
UBOOT_BINARY = "u-boot.img"
|
||||
@@ -12,16 +12,13 @@ UBOOT_IMAGE = "u-boot-${MACHINE}-${PV}-${PR}.img"
|
||||
UBOOT_SYMLINK = "u-boot-${MACHINE}.img"
|
||||
|
||||
SRC_URI = "git://arago-project.org/git/projects/u-boot-am33x.git;protocol=git;branch=int_am335xpsp_04.06.00.01-v2011.09-for-sdk-05.03.00.00 \
|
||||
file://2011.09git/0001-am335x_evm-boot-kernel-from-ext2-3-filesystem.patch \
|
||||
file://2011.09git/0002-am335x_evm-set-bootdelay-to-0.patch \
|
||||
file://2011.09git/0003-am335x-evm-make-rootfs-RO-on-boot.patch \
|
||||
file://2011.09git/0001-mach-types-Add-new-beaglebone-machine-type.patch \
|
||||
file://2011.09git/0003-am335x_evm-single-byte-address-EEPROM-for-board-iden.patch \
|
||||
file://2011.09git/0004-am335x-evm-fall-back-to-bone-if-header.config-is-emp.patch \
|
||||
file://2011.09git/0005-am335x-evm-Read-name-field-in-EEPROM-header-for-Beag.patch \
|
||||
file://2011.09git/0001-am335x_evm-only-do-in-kernel-dhcp-when-using-NFS-use.patch \
|
||||
file://2011.09git/0002-am335x_evm-boot-kernel-from-boot-in-ext2-3-filesyste.patch \
|
||||
file://2011.09git/0003-am335x_evm-set-bootdelay-to-1.patch \
|
||||
file://2011.09git/0004-am335x-evm-make-MMC-rootfs-RO-on-boot-so-fsck-works.patch \
|
||||
"
|
||||
|
||||
SRCREV = "9158d7f37d596b867039345cb2e3f8f18f54fe46"
|
||||
SRCREV = "f63b270e47f62f4d1a05b2001357e215966c6f5a"
|
||||
|
||||
LIC_FILES_CHKSUM = "file://COPYING;md5=1707d6db1d42237583f50183a5651ecb"
|
||||
|
||||
|
||||
Reference in New Issue
Block a user