summaryrefslogtreecommitdiffstats
path: root/recipes-bsp/u-boot
diff options
context:
space:
mode:
authorDenys Dmytriyenko <denys@ti.com>2014-06-24 09:16:19 +0000
committerDenys Dmytriyenko <denys@ti.com>2014-06-24 19:17:36 -0400
commit96e81aed3c89decd8f304191655da2e356ca150d (patch)
tree8bf7fb6ee4b5a96b555c2a0dd63829b8a72772e5 /recipes-bsp/u-boot
parent4cb36eead6dd7051de8a6a2ddf82daa9c81d09c5 (diff)
downloadmeta-ti-96e81aed3c89decd8f304191655da2e356ca150d.tar.gz
u-boot-am37x: remove old machine-specific version in favor of mainline
Signed-off-by: Denys Dmytriyenko <denys@ti.com>
Diffstat (limited to 'recipes-bsp/u-boot')
-rw-r--r--recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-ARM-omap3-Set-SPL-stack-size-to-8KB-image-to-54KB.patch172
-rw-r--r--recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-OMAP3-Beagle-Set-BOOTDELAY-to-3.patch31
-rw-r--r--recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-omap3_beagle-add-usbethaddr-setting-to-enable-networ.patch40
-rw-r--r--recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-omap3_evm-Added-function-calls-to-set-volts-speed-on.patch146
-rw-r--r--recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0002-am335x-am3517evm-beagleboard-am37x-Add-CONFIG_CMD_AS.patch73
-rw-r--r--recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0002-omap3evm-Make-the-board-start-at-800MHz.patch36
-rw-r--r--recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0003-beagleboard-Load-uImage-from-VFAT-by-default.patch34
-rw-r--r--recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0003-beagleboard-Make-xM-rev-C-go-to-800MHz.patch34
-rw-r--r--recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0004-beagleboard-Load-uImage-to-the-default-kernel-linux-.patch57
-rw-r--r--recipes-bsp/u-boot/u-boot-am37x_2012.04.01.bb41
10 files changed, 0 insertions, 664 deletions
diff --git a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-ARM-omap3-Set-SPL-stack-size-to-8KB-image-to-54KB.patch b/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-ARM-omap3-Set-SPL-stack-size-to-8KB-image-to-54KB.patch
deleted file mode 100644
index d36d8093..00000000
--- a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-ARM-omap3-Set-SPL-stack-size-to-8KB-image-to-54KB.patch
+++ /dev/null
@@ -1,172 +0,0 @@
1From e0820ccc38315d88192c19e98ea9b59d3ec7d4c8 Mon Sep 17 00:00:00 2001
2From: Tom Rini <trini@ti.com>
3Date: Tue, 8 May 2012 07:29:31 +0000
4Subject: [PATCH] ARM: omap3: Set SPL stack size to 8KB, image to 54KB.
5
6With older toolchains it is possible to not fit entirely into the 45KB
7that we had assigned to SPL. Adjust to allow for 8KB of stack (which
8should be more than required) and 54KB of text/data.
9
10Cc: Vaibhav Hiremath <hvaibhav@ti.com>
11Cc: Nagendra T S <nagendra@mistralsolutions.com>
12Cc: Thomas Weber <weber@corscience.de>
13Cc: Ilya Yanok <yanok@emcraft.com>
14Cc: Steve Sakoman <sakoman@gmail.com>
15Cc: Stefano Babic <sbabic@denx.de>
16Signed-off-by: Tom Rini <trini@ti.com>
17Acked-by: Stefano Babic <sbabic@denx.de>
18Acked-by: Vaibhav Hiremath <hvaibhav@ti.com>
19---
20 doc/SPL/README.omap3 | 4 ++--
21 include/configs/am3517_crane.h | 2 +-
22 include/configs/am3517_evm.h | 2 +-
23 include/configs/devkit8000.h | 2 +-
24 include/configs/mcx.h | 2 +-
25 include/configs/omap3_beagle.h | 2 +-
26 include/configs/omap3_evm_common.h | 2 +-
27 include/configs/omap3_overo.h | 2 +-
28 include/configs/tam3517-common.h | 2 +-
29 include/configs/tricorder.h | 2 +-
30 10 files changed, 11 insertions(+), 11 deletions(-)
31
32diff --git a/doc/SPL/README.omap3 b/doc/SPL/README.omap3
33index cc5d5c0..a543e65 100644
34--- a/doc/SPL/README.omap3
35+++ b/doc/SPL/README.omap3
36@@ -34,14 +34,14 @@ DDR1: 0x80000000 - 0xBFFFFFFF
37
38 Option 1 (SPL only):
39 0x40200800 - 0x4020BBFF: Area for SPL text, data and rodata
40-0x4020BC00 - 0x4020FFFC: Area for the SPL stack.
41+0x4020E000 - 0x4020FFFC: Area for the SPL stack.
42 0x80000000 - 0x8007FFFF: Area for the SPL BSS.
43 0x80100000: CONFIG_SYS_TEXT_BASE of U-Boot
44 0x80208000 - 0x80307FFF: malloc() pool available to SPL.
45
46 Option 2 (SPL or X-Loader):
47 0x40200800 - 0x4020BBFF: Area for SPL text, data and rodata
48-0x4020BC00 - 0x4020FFFC: Area for the SPL stack.
49+0x4020E000 - 0x4020FFFC: Area for the SPL stack.
50 0x80008000: CONFIG_SYS_TEXT_BASE of U-Boot
51 0x87000000 - 0x8707FFFF: Area for the SPL BSS.
52 0x87080000 - 0x870FFFFF: malloc() pool available to SPL.
53diff --git a/include/configs/am3517_crane.h b/include/configs/am3517_crane.h
54index 71321f3..1233985 100644
55--- a/include/configs/am3517_crane.h
56+++ b/include/configs/am3517_crane.h
57@@ -325,7 +325,7 @@
58 #define CONFIG_SPL
59 #define CONFIG_SPL_NAND_SIMPLE
60 #define CONFIG_SPL_TEXT_BASE 0x40200800
61-#define CONFIG_SPL_MAX_SIZE (45 * 1024)
62+#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
63 #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
64
65 #define CONFIG_SPL_BSS_START_ADDR 0x80000000
66diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
67index bbd19de..ff8d1b0 100644
68--- a/include/configs/am3517_evm.h
69+++ b/include/configs/am3517_evm.h
70@@ -324,7 +324,7 @@
71 #define CONFIG_SPL
72 #define CONFIG_SPL_NAND_SIMPLE
73 #define CONFIG_SPL_TEXT_BASE 0x40200800
74-#define CONFIG_SPL_MAX_SIZE (45 * 1024)
75+#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
76 #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
77
78 #define CONFIG_SPL_BSS_START_ADDR 0x80000000
79diff --git a/include/configs/devkit8000.h b/include/configs/devkit8000.h
80index eb7c376..248a5b2 100644
81--- a/include/configs/devkit8000.h
82+++ b/include/configs/devkit8000.h
83@@ -324,7 +324,7 @@
84 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
85
86 #define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/
87-#define CONFIG_SPL_MAX_SIZE 0xB400 /* 45 K */
88+#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
89 #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
90
91 #define CONFIG_SPL_BSS_START_ADDR 0x80000500 /* leave space for bootargs*/
92diff --git a/include/configs/mcx.h b/include/configs/mcx.h
93index e190e3e..f6a83a8 100644
94--- a/include/configs/mcx.h
95+++ b/include/configs/mcx.h
96@@ -325,7 +325,7 @@
97 #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
98
99 #define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/
100-#define CONFIG_SPL_MAX_SIZE (45 << 10)
101+#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
102 #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
103
104 /* move malloc and bss high to prevent clashing with the main image */
105diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
106index ddeb414..6bdc2c3 100644
107--- a/include/configs/omap3_beagle.h
108+++ b/include/configs/omap3_beagle.h
109@@ -399,7 +399,7 @@
110 #define CONFIG_SPL
111 #define CONFIG_SPL_NAND_SIMPLE
112 #define CONFIG_SPL_TEXT_BASE 0x40200800
113-#define CONFIG_SPL_MAX_SIZE (45 * 1024)
114+#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
115 #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
116
117 #define CONFIG_SPL_BSS_START_ADDR 0x80000000
118diff --git a/include/configs/omap3_evm_common.h b/include/configs/omap3_evm_common.h
119index 4910dda..47ebbef 100644
120--- a/include/configs/omap3_evm_common.h
121+++ b/include/configs/omap3_evm_common.h
122@@ -282,7 +282,7 @@
123 /* Defines for SPL */
124 #define CONFIG_SPL
125 #define CONFIG_SPL_TEXT_BASE 0x40200800
126-#define CONFIG_SPL_MAX_SIZE (45 * 1024) /* 45 KB */
127+#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
128 #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
129
130 #define CONFIG_SPL_BSS_START_ADDR 0x80000000
131diff --git a/include/configs/omap3_overo.h b/include/configs/omap3_overo.h
132index 64adc74..b0d144f 100644
133--- a/include/configs/omap3_overo.h
134+++ b/include/configs/omap3_overo.h
135@@ -303,7 +303,7 @@
136 #define CONFIG_SPL
137 #define CONFIG_SPL_NAND_SIMPLE
138 #define CONFIG_SPL_TEXT_BASE 0x40200800
139-#define CONFIG_SPL_MAX_SIZE (45 * 1024)
140+#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
141 #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
142
143 /* move malloc and bss high to prevent clashing with the main image */
144diff --git a/include/configs/tam3517-common.h b/include/configs/tam3517-common.h
145index 37eb87b..3fc2c44 100644
146--- a/include/configs/tam3517-common.h
147+++ b/include/configs/tam3517-common.h
148@@ -257,7 +257,7 @@
149 #define CONFIG_SPL_LDSCRIPT "$(CPUDIR)/omap-common/u-boot-spl.lds"
150
151 #define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/
152-#define CONFIG_SPL_MAX_SIZE (45 << 10) /* 45 K */
153+#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
154 #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
155
156 #define CONFIG_SYS_SPL_MALLOC_START 0x8f000000
157diff --git a/include/configs/tricorder.h b/include/configs/tricorder.h
158index 801a24f..ab911aa 100644
159--- a/include/configs/tricorder.h
160+++ b/include/configs/tricorder.h
161@@ -293,7 +293,7 @@
162 #define CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_SECTOR 0x300 /* address 0x60000 */
163
164 #define CONFIG_SPL_TEXT_BASE 0x40200000 /*CONFIG_SYS_SRAM_START*/
165-#define CONFIG_SPL_MAX_SIZE 0xB400 /* 45 K */
166+#define CONFIG_SPL_MAX_SIZE (54 * 1024) /* 8 KB for stack */
167 #define CONFIG_SPL_STACK LOW_LEVEL_SRAM_STACK
168
169 #define CONFIG_SPL_BSS_START_ADDR 0x80000000 /*CONFIG_SYS_SDRAM_BASE*/
170--
1711.7.0.4
172
diff --git a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-OMAP3-Beagle-Set-BOOTDELAY-to-3.patch b/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-OMAP3-Beagle-Set-BOOTDELAY-to-3.patch
deleted file mode 100644
index 4fb89e1f..00000000
--- a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-OMAP3-Beagle-Set-BOOTDELAY-to-3.patch
+++ /dev/null
@@ -1,31 +0,0 @@
1From 55161fca67023d6be30bdea495cc0fdbae316a64 Mon Sep 17 00:00:00 2001
2From: Tom Rini <trini@ti.com>
3Date: Wed, 9 Nov 2011 11:48:21 -0700
4Subject: [PATCH 1/4] OMAP3 Beagle: Set BOOTDELAY to 3
5
6This is TI Sitara SDK specific (unified user experience, 3s delay).
7
8Upstream-Status: Pending
9 * This will be submitted upstream by Tom Rini
10
11Signed-off-by: Tom Rini <trini@ti.com>
12---
13 include/configs/omap3_beagle.h | 2 +-
14 1 files changed, 1 insertions(+), 1 deletions(-)
15
16diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
17index 58a29b8..ba73aa6 100644
18--- a/include/configs/omap3_beagle.h
19+++ b/include/configs/omap3_beagle.h
20@@ -213,7 +213,7 @@
21 /* partition */
22
23 /* Environment information */
24-#define CONFIG_BOOTDELAY 2
25+#define CONFIG_BOOTDELAY 3
26
27 #define CONFIG_EXTRA_ENV_SETTINGS \
28 "loadaddr=0x80200000\0" \
29--
301.7.0.4
31
diff --git a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-omap3_beagle-add-usbethaddr-setting-to-enable-networ.patch b/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-omap3_beagle-add-usbethaddr-setting-to-enable-networ.patch
deleted file mode 100644
index 05df3222..00000000
--- a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-omap3_beagle-add-usbethaddr-setting-to-enable-networ.patch
+++ /dev/null
@@ -1,40 +0,0 @@
1From c56786770eb0ccb95204cb72b961c44c65ff343b Mon Sep 17 00:00:00 2001
2From: Chase Maupin <Chase.Maupin@ti.com>
3Date: Thu, 17 May 2012 09:51:50 -0500
4Subject: [PATCH] omap3_beagle: add usbethaddr setting to enable networking
5
6* In order for the SMSC USB ethernet device to work the
7 usbethaddr setting must be set when the "usb start" command
8 is executed and the network device is discovered.
9* Currently set this for de:ad:be:ef until we can start
10 generating random or semi-random MAC addresses.
11* Based on work by Steve Kipisz and Joel Fernandez
12
13Upstream-Status: Not Upstreamable
14 * We cannot upstream this hard coded MAC address setting.
15 * User's should look at the following web page for information on
16 how to generate a MAC address, but this patch enables the out
17 of box experience for the SDK.
18 http://www.denx.de/wiki/view/DULG/WhereCanIGetAValidMACAddress
19
20
21Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
22---
23 include/configs/omap3_beagle.h | 1 +
24 1 files changed, 1 insertions(+), 0 deletions(-)
25
26diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
27index ddeb414..58a29b8 100644
28--- a/include/configs/omap3_beagle.h
29+++ b/include/configs/omap3_beagle.h
30@@ -219,6 +219,7 @@
31 "loadaddr=0x80200000\0" \
32 "rdaddr=0x81000000\0" \
33 "usbtty=cdc_acm\0" \
34+ "usbethaddr=de:ad:be:ef\0" \
35 "bootfile=uImage.beagle\0" \
36 "console=ttyO2,115200n8\0" \
37 "mpurate=auto\0" \
38--
391.7.0.4
40
diff --git a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-omap3_evm-Added-function-calls-to-set-volts-speed-on.patch b/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-omap3_evm-Added-function-calls-to-set-volts-speed-on.patch
deleted file mode 100644
index 4fc6e98a..00000000
--- a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0001-omap3_evm-Added-function-calls-to-set-volts-speed-on.patch
+++ /dev/null
@@ -1,146 +0,0 @@
1From eff8924b57d21eadfe749e500617340b1a730c17 Mon Sep 17 00:00:00 2001
2From: Schuyler Patton <spatton@ti.com>
3Date: Thu, 30 Jun 2011 13:39:25 -0500
4Subject: [PATCH 1/3] omap3_evm: Added function calls to set volts, speed on OMAP36xx parts
5
6* evm.c
7
8* Added setup calls to set voltage and speed
9
10* Added calls in misc_init_r to twl4030_power_mpu_init and set_mpu_clock
11 functions. These set VDD1 to 1.35v and mpu clock to 1GHz respectively.
12 There is a check performed to make sure that this is only called on
13 omap36xx class parts.
14
15* twl4030.c
16
17* Added twl4030_power_mpu_init function to set VDD1 to 1.35 Volts
18
19* This is done to allow omap36xx parts to run at 1GHz.
20
21* clock.c
22
23* Added set_mpu_clk function to allow u-boot to set the clock
24 rate.
25
26* sys_proto.h
27
28* Added the function prototype set_mpu_clock
29
30* twl4030.h
31
32* Added twl4030_power_mpu_init function prototype
33
34Upstream-Status: Pending
35
36Signed-off-by: Schuyler Patton <spatton@ti.com>
37---
38 arch/arm/cpu/armv7/omap3/clock.c | 15 +++++++++++++++
39 arch/arm/include/asm/arch-omap3/sys_proto.h | 2 ++
40 board/ti/evm/evm.c | 5 +++++
41 drivers/power/twl4030.c | 12 ++++++++++++
42 include/twl4030.h | 3 +++
43 5 files changed, 37 insertions(+), 0 deletions(-)
44
45diff --git a/arch/arm/cpu/armv7/omap3/clock.c b/arch/arm/cpu/armv7/omap3/clock.c
46index 567817e..46a28a3 100644
47--- a/arch/arm/cpu/armv7/omap3/clock.c
48+++ b/arch/arm/cpu/armv7/omap3/clock.c
49@@ -35,6 +35,21 @@
50 #include <command.h>
51
52 /******************************************************************************
53+ * Setting the Clock speed
54+ *
55+ *****************************************************************************/
56+void set_mpu_clk(int speed)
57+{
58+ struct prcm *prcm_base = (struct prcm *)PRCM_BASE;
59+
60+
61+ /* Set M */
62+ sr32(&prcm_base->clksel1_pll_mpu, 8, 11, speed);
63+ /* lock mode */
64+ sr32(&prcm_base->clken_pll_mpu, 0, 3, PLL_LOCK);
65+}
66+
67+/******************************************************************************
68 * get_sys_clk_speed() - determine reference oscillator speed
69 * based on known 32kHz clock and gptimer.
70 *****************************************************************************/
71diff --git a/arch/arm/include/asm/arch-omap3/sys_proto.h b/arch/arm/include/asm/arch-omap3/sys_proto.h
72index 2a89e56..9db13d7 100644
73--- a/arch/arm/include/asm/arch-omap3/sys_proto.h
74+++ b/arch/arm/include/asm/arch-omap3/sys_proto.h
75@@ -36,6 +36,8 @@ void prcm_init(void);
76 void per_clocks_enable(void);
77 void ehci_clocks_enable(void);
78
79+void set_mpu_clk(int speed);
80+
81 void memif_init(void);
82 void sdrc_init(void);
83 void do_sdrc_init(u32, u32);
84diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
85index 8497aee..91eb93d 100644
86--- a/board/ti/evm/evm.c
87+++ b/board/ti/evm/evm.c
88@@ -39,6 +39,7 @@
89 #include <asm/mach-types.h>
90 #include <linux/mtd/nand.h>
91 #include "evm.h"
92+#include <twl4030.h>
93
94 #define OMAP3EVM_GPIO_ETH_RST_GEN1 64
95 #define OMAP3EVM_GPIO_ETH_RST_GEN2 7
96@@ -177,6 +178,10 @@ int misc_init_r(void)
97 #endif
98 dieid_num_r();
99
100+ if (get_cpu_family() == CPU_OMAP36XX) {
101+ twl4030_power_mpu_init();
102+ set_mpu_clk(500);
103+ }
104 return 0;
105 }
106
107diff --git a/drivers/power/twl4030.c b/drivers/power/twl4030.c
108index 36b2144..670b4cb 100644
109--- a/drivers/power/twl4030.c
110+++ b/drivers/power/twl4030.c
111@@ -105,6 +105,18 @@ void twl4030_power_init(void)
112 TWL4030_PM_RECEIVER_DEV_GRP_P1);
113 }
114
115+#define VDD1_VSEL_135 0x3C
116+
117+void twl4030_power_mpu_init(void)
118+{
119+ unsigned char byte;
120+
121+ /* 1.4 Volts */
122+ byte = VDD1_VSEL_135;
123+ twl4030_i2c_write_u8(TWL4030_CHIP_PM_RECEIVER, byte,
124+ TWL4030_PM_RECEIVER_VDD1_VSEL);
125+}
126+
127 void twl4030_power_mmc_init(void)
128 {
129 /* Set VMMC1 to 3.15 Volts */
130diff --git a/include/twl4030.h b/include/twl4030.h
131index 9cd32ab..91d36b8 100644
132--- a/include/twl4030.h
133+++ b/include/twl4030.h
134@@ -510,6 +510,9 @@ static inline int twl4030_i2c_read_u8(u8 chip_no, u8 *val, u8 reg)
135 * Power
136 */
137
138+/*For setting VDD1 */
139+void twl4030_power_mpu_init(void);
140+
141 /* For hardware resetting */
142 void twl4030_power_reset_init(void);
143 /* For setting device group and voltage */
144--
1451.7.0.4
146
diff --git a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0002-am335x-am3517evm-beagleboard-am37x-Add-CONFIG_CMD_AS.patch b/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0002-am335x-am3517evm-beagleboard-am37x-Add-CONFIG_CMD_AS.patch
deleted file mode 100644
index 53657c08..00000000
--- a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0002-am335x-am3517evm-beagleboard-am37x-Add-CONFIG_CMD_AS.patch
+++ /dev/null
@@ -1,73 +0,0 @@
1From 883551659d9b15dfb1ed7ad8ae4b34bfd1fa0fd9 Mon Sep 17 00:00:00 2001
2From: Tom Rini <trini@ti.com>
3Date: Wed, 16 Nov 2011 14:50:49 -0700
4Subject: [PATCH 2/4] am335x/am3517evm/beagleboard/am37x: Add CONFIG_CMD_ASKENV
5
6This is TI Sitara SDK specific (unified user experience, askenv command).
7
8Upstream-Status: Pending
9 * This will be submitted upstream by Tom Rini
10
11Signed-off-by: Tom Rini <trini@ti.com>
12---
13 include/configs/am335x_evm.h | 2 ++
14 include/configs/am3517_evm.h | 2 ++
15 include/configs/omap3_beagle.h | 2 ++
16 include/configs/omap3_evm.h | 2 ++
17 4 files changed, 8 insertions(+), 0 deletions(-)
18
19diff --git a/include/configs/am335x_evm.h b/include/configs/am335x_evm.h
20index d0fbc88..5cd7d6d 100644
21--- a/include/configs/am335x_evm.h
22+++ b/include/configs/am335x_evm.h
23@@ -26,6 +26,8 @@
24 #include <asm/arch/cpu.h>
25 #include <asm/arch/hardware.h>
26
27+#define CONFIG_CMD_ASKENV
28+
29 #define CONFIG_ENV_SIZE 0x400
30 #define CONFIG_SYS_MALLOC_LEN (CONFIG_ENV_SIZE + (8 * 1024))
31 #define CONFIG_SYS_PROMPT "U-Boot# "
32diff --git a/include/configs/am3517_evm.h b/include/configs/am3517_evm.h
33index b5f75d1..2b3fce7 100644
34--- a/include/configs/am3517_evm.h
35+++ b/include/configs/am3517_evm.h
36@@ -137,6 +137,8 @@
37 /* commands to include */
38 #include <config_cmd_default.h>
39
40+#define CONFIG_CMD_ASKENV
41+
42 #define CONFIG_CMD_EXT2 /* EXT2 Support */
43 #define CONFIG_CMD_FAT /* FAT support */
44 #define CONFIG_CMD_JFFS2 /* JFFS2 Support */
45diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
46index ba73aa6..b270598 100644
47--- a/include/configs/omap3_beagle.h
48+++ b/include/configs/omap3_beagle.h
49@@ -146,6 +146,8 @@
50 /* commands to include */
51 #include <config_cmd_default.h>
52
53+#define CONFIG_CMD_ASKENV
54+
55 #define CONFIG_CMD_CACHE
56 #define CONFIG_CMD_EXT2 /* EXT2 Support */
57 #define CONFIG_CMD_FAT /* FAT support */
58diff --git a/include/configs/omap3_evm.h b/include/configs/omap3_evm.h
59index 1fcb7af..215d67d 100644
60--- a/include/configs/omap3_evm.h
61+++ b/include/configs/omap3_evm.h
62@@ -42,6 +42,8 @@
63 */
64 #include <config_cmd_default.h>
65
66+#define CONFIG_CMD_ASKENV
67+
68 #define CONFIG_CMD_EXT2
69 #define CONFIG_CMD_FAT
70 #define CONFIG_CMD_JFFS2
71--
721.7.0.4
73
diff --git a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0002-omap3evm-Make-the-board-start-at-800MHz.patch b/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0002-omap3evm-Make-the-board-start-at-800MHz.patch
deleted file mode 100644
index 6170ddfd..00000000
--- a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0002-omap3evm-Make-the-board-start-at-800MHz.patch
+++ /dev/null
@@ -1,36 +0,0 @@
1From a0f4f7b85d004db36a24cc05e9c34f137186270b Mon Sep 17 00:00:00 2001
2From: Chase Maupin <Chase.Maupin@ti.com>
3Date: Wed, 23 May 2012 09:25:06 -0500
4Subject: [PATCH 2/3] omap3evm: Make the board start at 800MHz
5
6* It is safe to start the the 3630 silicon at 800MHz for all
7 revisions. Go ahead and bump the speed to 800MHz during boot
8 instead of using the default 500MHz speed.
9* This patch was based on work by Tom Rini <trini@ti.com> at
10 http://arago-project.org/git/projects/?p=u-boot-am33x.git;a=commit;h=ad130035df754931f2939902e453cc3736412f5f
11
12Upstream-Status: Pending
13 * Will be submitted upstream since it is safe for all silicon
14 revisions to boot at 800MHz according to HW team.
15
16Signed-off-by: Chase Maupin <Chase.Maupin@ti.com>
17---
18 board/ti/evm/evm.c | 2 +-
19 1 files changed, 1 insertions(+), 1 deletions(-)
20
21diff --git a/board/ti/evm/evm.c b/board/ti/evm/evm.c
22index 91eb93d..0d0b4a2 100644
23--- a/board/ti/evm/evm.c
24+++ b/board/ti/evm/evm.c
25@@ -180,7 +180,7 @@ int misc_init_r(void)
26
27 if (get_cpu_family() == CPU_OMAP36XX) {
28 twl4030_power_mpu_init();
29- set_mpu_clk(500);
30+ set_mpu_clk(800);
31 }
32 return 0;
33 }
34--
351.7.0.4
36
diff --git a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0003-beagleboard-Load-uImage-from-VFAT-by-default.patch b/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0003-beagleboard-Load-uImage-from-VFAT-by-default.patch
deleted file mode 100644
index c40da83c..00000000
--- a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0003-beagleboard-Load-uImage-from-VFAT-by-default.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From f2a15cd9e96648e05cb39159ba74cbfbfc8ff999 Mon Sep 17 00:00:00 2001
2From: Tom Rini <trini@ti.com>
3Date: Thu, 17 Nov 2011 08:41:42 -0700
4Subject: [PATCH 3/4] beagleboard: Load uImage from VFAT by default.
5
6This is TI Sitara SDK specific (unified user experience, load uImage
7from vfat).
8
9Upstream-Status: Not Appropriate
10 * This patch is to make the u-boot for beagleboard consistent
11 with other versions used in the AMSDK and doesn't make
12 sense up stream.
13
14Signed-off-by: Tom Rini <trini@ti.com>
15---
16 include/configs/omap3_beagle.h | 2 +-
17 1 files changed, 1 insertions(+), 1 deletions(-)
18
19diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
20index b270598..ea62580 100644
21--- a/include/configs/omap3_beagle.h
22+++ b/include/configs/omap3_beagle.h
23@@ -305,7 +305,7 @@
24 "echo Running uenvcmd ...;" \
25 "run uenvcmd;" \
26 "fi;" \
27- "if run loaduimage; then " \
28+ "if run loaduimagefat; then " \
29 "run mmcboot;" \
30 "fi;" \
31 "fi;" \
32--
331.7.0.4
34
diff --git a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0003-beagleboard-Make-xM-rev-C-go-to-800MHz.patch b/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0003-beagleboard-Make-xM-rev-C-go-to-800MHz.patch
deleted file mode 100644
index 20b47d07..00000000
--- a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0003-beagleboard-Make-xM-rev-C-go-to-800MHz.patch
+++ /dev/null
@@ -1,34 +0,0 @@
1From 372d110126f37f9f8b7d4bbedd3f02cf80e587de Mon Sep 17 00:00:00 2001
2From: Tom Rini <trini@ti.com>
3Date: Wed, 30 Nov 2011 16:16:21 -0700
4Subject: [PATCH 3/3] beagleboard: Make xM rev C go to 800MHz
5
6* This is the highest frequency supported on xM without BIAS
7 drivers.
8
9Upstream-Status: Pending
10 * Will be submitted upstream since it is safe for all silicon
11 revisions to boot at 800MHz according to HW team.
12
13Signed-off-by: Tom Rini <trini@ti.com>
14---
15 board/ti/beagle/beagle.c | 3 +++
16 1 files changed, 3 insertions(+), 0 deletions(-)
17
18diff --git a/board/ti/beagle/beagle.c b/board/ti/beagle/beagle.c
19index e26b387..69a7b4e 100644
20--- a/board/ti/beagle/beagle.c
21+++ b/board/ti/beagle/beagle.c
22@@ -346,6 +346,9 @@ int misc_init_r(void)
23 TWL4030_PM_RECEIVER_VAUX2_VSEL_18,
24 TWL4030_PM_RECEIVER_VAUX2_DEV_GRP,
25 TWL4030_PM_RECEIVER_DEV_GRP_P1);
26+ /* 800MHz support */
27+ twl4030_power_mpu_init();
28+ set_mpu_clk(800);
29 break;
30 default:
31 printf("Beagle unknown 0x%02x\n", get_board_revision());
32--
331.7.0.4
34
diff --git a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0004-beagleboard-Load-uImage-to-the-default-kernel-linux-.patch b/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0004-beagleboard-Load-uImage-to-the-default-kernel-linux-.patch
deleted file mode 100644
index 86d6622a..00000000
--- a/recipes-bsp/u-boot/u-boot-am37x-2012.04.01/0004-beagleboard-Load-uImage-to-the-default-kernel-linux-.patch
+++ /dev/null
@@ -1,57 +0,0 @@
1From 715afb049d2675106e26c5225e7e321374c32f85 Mon Sep 17 00:00:00 2001
2From: Tom Rini <trini@ti.com>
3Date: Thu, 17 Nov 2011 16:54:01 -0700
4Subject: [PATCH 4/4] beagleboard: Load uImage to the default kernel linux address
5
6This is TI Sitara SDK specific (unified user experience, load uImage
7to an 'XIP' location).
8
9Upstream-Status: Pending
10 * This functionality is being discussed upstream and there
11 is not a concensus yet.
12
13Signed-off-by: Tom Rini <trini@ti.com>
14---
15 include/configs/omap3_beagle.h | 13 +++++++------
16 1 files changed, 7 insertions(+), 6 deletions(-)
17
18diff --git a/include/configs/omap3_beagle.h b/include/configs/omap3_beagle.h
19index ea62580..00b2abe 100644
20--- a/include/configs/omap3_beagle.h
21+++ b/include/configs/omap3_beagle.h
22@@ -219,6 +219,7 @@
23
24 #define CONFIG_EXTRA_ENV_SETTINGS \
25 "loadaddr=0x80200000\0" \
26+ "kloadaddr=0x80007fc0\0" \
27 "rdaddr=0x81000000\0" \
28 "usbtty=cdc_acm\0" \
29 "usbethaddr=de:ad:be:ef\0" \
30@@ -272,18 +273,18 @@
31 "root=${ramroot} " \
32 "rootfstype=${ramrootfstype}\0" \
33 "loadramdisk=fatload mmc ${mmcdev} ${rdaddr} ramdisk.gz\0" \
34- "loaduimagefat=fatload mmc ${mmcdev} ${loadaddr} uImage\0" \
35- "loaduimage=ext2load mmc ${mmcdev}:2 ${loadaddr} /boot/uImage\0" \
36+ "loaduimagefat=fatload mmc ${mmcdev} ${kloadaddr} uImage\0" \
37+ "loaduimage=ext2load mmc ${mmcdev}:2 ${kloadaddr} /boot/uImage\0" \
38 "mmcboot=echo Booting from mmc ...; " \
39 "run mmcargs; " \
40- "bootm ${loadaddr}\0" \
41+ "bootm ${kloadaddr}\0" \
42 "nandboot=echo Booting from nand ...; " \
43 "run nandargs; " \
44- "nand read ${loadaddr} 280000 400000; " \
45- "bootm ${loadaddr}\0" \
46+ "nand read ${kloadaddr} 280000 400000; " \
47+ "bootm ${kloadaddr}\0" \
48 "ramboot=echo Booting from ramdisk ...; " \
49 "run ramargs; " \
50- "bootm ${loadaddr}\0" \
51+ "bootm ${kloadaddr}\0" \
52 "userbutton=if gpio input 173; then run userbutton_xm; " \
53 "else run userbutton_nonxm; fi;\0" \
54 "userbutton_xm=gpio input 4;\0" \
55--
561.7.0.4
57
diff --git a/recipes-bsp/u-boot/u-boot-am37x_2012.04.01.bb b/recipes-bsp/u-boot/u-boot-am37x_2012.04.01.bb
deleted file mode 100644
index 1cd96b6a..00000000
--- a/recipes-bsp/u-boot/u-boot-am37x_2012.04.01.bb
+++ /dev/null
@@ -1,41 +0,0 @@
1require u-boot-ti.inc
2
3DESCRIPTION = "u-boot bootloader for ARM MPU devices"
4
5COMPATIBLE_MACHINE = "am37x-evm|beagleboard"
6
7BRANCH ?= "master"
8
9PR = "r1+gitr${SRCPV}"
10
11# v2012.04.01
12SRCREV = "415d386877df49eb051b85ef74fa59a16dc17c7d"
13
14SRC_URI = "git://git.denx.de/u-boot.git;protocol=git;branch=${BRANCH}"
15
16# Add patches for the AMSDK
17# - 0001-omap3-beagle-add-usbethaddr....Not for Upstream
18# - 0001-OMAP3-Beagle-Set-BOOTDELAY....Pending Upstream
19# - 0002-am335x-am3517evm-beagleboard....Pending Upstream
20# - 0003-beagleboard-Load-uImage-from....Not for Upstream
21# - 0004-beagleboard-Load-uImage-to....Pending Upstream
22# - 0001-omap3_evm-Added-function....Pending Upstream
23# - 0002-omap3evm-Make-the-board....Pending Upstream
24# - 0003-beagleboard-Make-xM-rev....Pending Upstream
25# - 0001-ARM-omap3-Set-SPL-stack-size-to-8KB-image-to-54KB.patch....Upstreamed
26
27# Add a patch to set a default usbethaddr address to enable the out of box
28# experience.
29SRC_URI += "file://0001-omap3_beagle-add-usbethaddr-setting-to-enable-networ.patch \
30 file://0001-OMAP3-Beagle-Set-BOOTDELAY-to-3.patch \
31 file://0002-am335x-am3517evm-beagleboard-am37x-Add-CONFIG_CMD_AS.patch \
32 file://0003-beagleboard-Load-uImage-from-VFAT-by-default.patch \
33 file://0004-beagleboard-Load-uImage-to-the-default-kernel-linux-.patch \
34 file://0001-omap3_evm-Added-function-calls-to-set-volts-speed-on.patch \
35 file://0002-omap3evm-Make-the-board-start-at-800MHz.patch \
36 file://0003-beagleboard-Make-xM-rev-C-go-to-800MHz.patch \
37 file://0001-ARM-omap3-Set-SPL-stack-size-to-8KB-image-to-54KB.patch \
38 file://0001-armv7-Unaligned-access-fix.patch \
39 "
40
41SPL_BINARY = "MLO"
generated by cgit v1.2.3-54-g00ecf (git 2.39.0) at 2024-11-17 16:24:57 +0000