[Armadeus-commitlog] armadeus branch, master, updated. armadeus-4.0-2479-gfe5da7b
Brought to you by:
sszy
|
From: jorasse <jo...@us...> - 2011-08-10 18:35:36
|
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "armadeus".
The branch, master has been updated
via fe5da7bb5cdd900019ab087eb33a4e0cb96e51de (commit)
via dcb7bb2502c39f60070b9631d343c2a51060813f (commit)
from 5ba623f5aa2bf7ee8b53e4580df9682b277ab3a7 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit fe5da7bb5cdd900019ab087eb33a4e0cb96e51de
Author: Eric Jarrige <eri...@ar...>
Date: Wed Aug 10 20:23:19 2011 +0200
[UBOOT] 2011.06 APF9328: Fix data cache issue that break linux boot with U-Boot upstream
commit dcb7bb2502c39f60070b9631d343c2a51060813f
Author: Eric Jarrige <eri...@ar...>
Date: Wed Aug 10 20:19:14 2011 +0200
[UBOOT] 2011.06 APF9328: Fix data cache issue that break linux boot with U-Boot upstream
-----------------------------------------------------------------------
Summary of changes:
.../armadeus/apf9328/apf9328-u-boot-2011.06.h | 16 +++++++----
patches/u-boot/2011.06/01-mx1-gpio-mode.patch | 27 ++++++++++++++++++++
.../2011.06/{01-mx1-i2c.patch => 02-mx1-i2c.patch} | 24 ++++-------------
.../2011.06/{02-apf9328.patch => 03-apf9328.patch} | 10 +++---
...28-makefile.patch => 04-apf9328-makefile.patch} | 12 ++++----
...pf9328-config.patch => 05-apf9328-config.patch} | 27 +++++++++++---------
.../{05-mx1-pllclk.patch => 06-mx1-pllclk.patch} | 17 +++---------
patches/u-boot/2011.06/07-mx1-pllclk-debug.patch | 22 ++++++++++++++++
.../2011.06/{06-DM9000.patch => 08-DM9000.patch} | 5 +--
...x1-relocation.patch => 09-mx1-relocation.patch} | 10 +++++--
patches/u-boot/2011.06/series | 18 +++++++------
11 files changed, 114 insertions(+), 74 deletions(-)
create mode 100644 patches/u-boot/2011.06/01-mx1-gpio-mode.patch
rename patches/u-boot/2011.06/{01-mx1-i2c.patch => 02-mx1-i2c.patch} (73%)
rename patches/u-boot/2011.06/{02-apf9328.patch => 03-apf9328.patch} (99%)
rename patches/u-boot/2011.06/{03-apf9328-makefile.patch => 04-apf9328-makefile.patch} (85%)
rename patches/u-boot/2011.06/{04-apf9328-config.patch => 05-apf9328-config.patch} (98%)
rename patches/u-boot/2011.06/{05-mx1-pllclk.patch => 06-mx1-pllclk.patch} (79%)
create mode 100644 patches/u-boot/2011.06/07-mx1-pllclk-debug.patch
rename patches/u-boot/2011.06/{06-DM9000.patch => 08-DM9000.patch} (93%)
rename patches/u-boot/2011.06/{07-mx1-relocation.patch => 09-mx1-relocation.patch} (64%)
diff --git a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
index b5b5794..ef5e54a 100644
--- a/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
+++ b/buildroot/target/device/armadeus/apf9328/apf9328-u-boot-2011.06.h
@@ -40,8 +40,8 @@
#define CONFIG_ARM920T 1 /* this is an ARM920T CPU */
#define CONFIG_IMX 1 /* in a Motorola MC9328MXL Chip */
#define CONFIG_apf9328 1 /* on a Armadeus project board */
-#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
-
+#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
+#define CONFIG_SYS_DCACHE_OFF /* make kernel 2.6.29 boot crash */
/*
* Enable the call to misc_init_r() for miscellaneous platform
* dependent initialization.
@@ -233,7 +233,7 @@
#define CONFIG_SYS_LONGHELP
#define CONFIG_SYS_PROMPT "BIOS> " /* prompt string */
-#define CONFIG_SYS_CBSIZE 256 /* console I/O buffer */
+#define CONFIG_SYS_CBSIZE 2048 /* console I/O buffer */
#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
#define CONFIG_SYS_MAXARGS 16 /* max command args */
#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* bootargs buf size*/
@@ -250,7 +250,6 @@
#define CONFIG_CMDLINE_TAG 1 /* send commandline to Kernel */
#define CONFIG_SETUP_MEMORY_TAGS 1 /* send memory definition to kernel */
#define CONFIG_INITRD_TAG 1 /* send initrd params */
-#undef CONFIG_VFD /* do not send framebuffer setup */
/*
* Malloc pool need to host env + 128 Kb reserve for other allocations.
@@ -406,11 +405,16 @@
#endif
#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_SDRAM_1_BASE
+
+/* lowlevel_linit copy U-Boot at CONFIG_SYS_INIT_SP_ADDR (here in RAM) */
+/* making u-boot runnable from flash and also RAM that is usefull to boot */
+/* from serial port and from flash with only one version of U-Boot */
#ifndef CONFIG_SYS_TEXT_BASE
-#define CONFIG_SYS_TEXT_BASE 0x08E00000
+#define CONFIG_SYS_TEXT_BASE 0x08000000
#endif
-#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x0f00000)
+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE \
+ + CONFIG_SYS_SDRAM_1_SIZE - 0x0100000)
/*
* Configuration for a maximum 32MB of FLASH memory
diff --git a/patches/u-boot/2011.06/01-mx1-gpio-mode.patch b/patches/u-boot/2011.06/01-mx1-gpio-mode.patch
new file mode 100644
index 0000000..e4890ff
--- /dev/null
+++ b/patches/u-boot/2011.06/01-mx1-gpio-mode.patch
@@ -0,0 +1,27 @@
+mx1: export imx_gpio_mode() function
+
+Add imx_gpio_mode() to Freescale imx1/L/S public functions
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+Cc: Stefano Babic <sb...@de...>
+---
+ arch/arm/include/asm/arch-imx/imx-regs.h | 7 +++++++
+ 1 files changed, 7 insertions(+), 0 deletions(-)
+
+diff --git a/arch/arm/include/asm/arch-imx/imx-regs.h b/arch/arm/include/asm/arch-imx/imx-regs.h
+index ec94ba9..0c26a36 100644
+--- a/arch/arm/include/asm/arch-imx/imx-regs.h
++++ b/arch/arm/include/asm/arch-imx/imx-regs.h
+@@ -1,5 +1,12 @@
+ #ifndef _IMX_REGS_H
+ #define _IMX_REGS_H
++
++#ifndef __ASSEMBLY__
++
++extern void imx_gpio_mode(int gpio_mode);
++
++#endif /* __ASSEMBLY__ */
++
+ /* ------------------------------------------------------------------------
+ * Motorola IMX system registers
+ * ------------------------------------------------------------------------
diff --git a/patches/u-boot/2011.06/01-mx1-i2c.patch b/patches/u-boot/2011.06/02-mx1-i2c.patch
similarity index 73%
rename from patches/u-boot/2011.06/01-mx1-i2c.patch
rename to patches/u-boot/2011.06/02-mx1-i2c.patch
index a949806..ff364db 100644
--- a/patches/u-boot/2011.06/01-mx1-i2c.patch
+++ b/patches/u-boot/2011.06/02-mx1-i2c.patch
@@ -1,30 +1,18 @@
mx1: add i2c registers
-Add i2c registers for Motorola imx1/L/S
+Add i2c registers for Freescale imx1/L/S
Signed-off-by: Eric Jarrige <eri...@ar...>
+Cc: Stefano Babic <sb...@de...>
---
- arch/arm/include/asm/arch-imx/imx-regs.h | 30 ++++++++++++++++++++++++++++++
- 1 files changed, 30 insertions(+), 0 deletions(-)
+ arch/arm/include/asm/arch-imx/imx-regs.h | 23 +++++++++++++++++++++++
+ 1 files changed, 23 insertions(+), 0 deletions(-)
diff --git a/arch/arm/include/asm/arch-imx/imx-regs.h b/arch/arm/include/asm/arch-imx/imx-regs.h
-index ec94ba9..a7b3404 100644
+index 0c26a36..a7b3404 100644
--- a/arch/arm/include/asm/arch-imx/imx-regs.h
+++ b/arch/arm/include/asm/arch-imx/imx-regs.h
-@@ -1,5 +1,12 @@
- #ifndef _IMX_REGS_H
- #define _IMX_REGS_H
-+
-+#ifndef __ASSEMBLY__
-+
-+extern void imx_gpio_mode(int gpio_mode);
-+
-+#endif /* __ASSEMBLY__ */
-+
- /* ------------------------------------------------------------------------
- * Motorola IMX system registers
- * ------------------------------------------------------------------------
-@@ -631,4 +638,27 @@
+@@ -638,4 +638,27 @@ extern void imx_gpio_mode(int gpio_mode);
#define TSTAT_CAPT (1<<1) /* Capture event */
#define TSTAT_COMP (1) /* Compare event */
diff --git a/patches/u-boot/2011.06/02-apf9328.patch b/patches/u-boot/2011.06/03-apf9328.patch
similarity index 99%
rename from patches/u-boot/2011.06/02-apf9328.patch
rename to patches/u-boot/2011.06/03-apf9328.patch
index a2b8433..624b1ae 100644
--- a/patches/u-boot/2011.06/02-apf9328.patch
+++ b/patches/u-boot/2011.06/03-apf9328.patch
@@ -4,6 +4,7 @@ Add Armadeus Project board APF9328
Signed-off-by: Eric Jarrige <eri...@ar...>
Signed-off-by: Nicolas Colombain <nic...@ar...>
+Cc: Nicolas Colombain <nic...@ar...>
---
board/armadeus/apf9328/Makefile | 51 +++
board/armadeus/apf9328/apf9328.c | 91 ++++++
@@ -13,8 +14,8 @@ Signed-off-by: Nicolas Colombain <nic...@ar...>
board/armadeus/apf9328/fpga.c | 121 ++++++++
board/armadeus/apf9328/fpga.h | 30 ++
board/armadeus/apf9328/i2c.c | 276 +++++++++++++++++++
- board/armadeus/apf9328/lowlevel_init.S | 470 ++++++++++++++++++++++++++++++++
- 9 files changed, 1247 insertions(+), 0 deletions(-)
+ board/armadeus/apf9328/lowlevel_init.S | 469 ++++++++++++++++++++++++++++++++
+ 9 files changed, 1246 insertions(+), 0 deletions(-)
create mode 100644 board/armadeus/apf9328/Makefile
create mode 100644 board/armadeus/apf9328/apf9328.c
create mode 100644 board/armadeus/apf9328/apf9328fpga.c
@@ -852,10 +853,10 @@ index 0000000..0ba0a8d
+#endif /* CONFIG_HARD_I2C */
diff --git a/board/armadeus/apf9328/lowlevel_init.S b/board/armadeus/apf9328/lowlevel_init.S
new file mode 100644
-index 0000000..f17bcf9
+index 0000000..e4c6157
--- /dev/null
+++ b/board/armadeus/apf9328/lowlevel_init.S
-@@ -0,0 +1,470 @@
+@@ -0,0 +1,469 @@
+/*
+ * (C) Copyright 2005-2011 ej Armadeus Project <eri...@ar...>
+ * Copyright (C) 2004 Sascha Hauer, Synertronixx GmbH
@@ -1325,4 +1326,3 @@ index 0000000..f17bcf9
+ .word copy2ram
+_start_adr:
+ .word _start
-+
diff --git a/patches/u-boot/2011.06/03-apf9328-makefile.patch b/patches/u-boot/2011.06/04-apf9328-makefile.patch
similarity index 85%
rename from patches/u-boot/2011.06/03-apf9328-makefile.patch
rename to patches/u-boot/2011.06/04-apf9328-makefile.patch
index 72cbf14..17f32c3 100644
--- a/patches/u-boot/2011.06/03-apf9328-makefile.patch
+++ b/patches/u-boot/2011.06/04-apf9328-makefile.patch
@@ -1,6 +1,6 @@
-apf9328: add apf9328 board
+apf9328: add apf9328 board in Makefile
-add apf9328 board
+add apf9328 board definition in makefile, MAKEALL and MAINTAINERS list
Signed-off-by: Eric Jarrige <eri...@ar...>
---
@@ -10,10 +10,10 @@ Signed-off-by: Eric Jarrige <eri...@ar...>
3 files changed, 6 insertions(+), 0 deletions(-)
diff --git a/MAINTAINERS b/MAINTAINERS
-index f8d8559..7b8d537 100644
+index f895e9a..48807fe 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
-@@ -681,6 +681,10 @@ Grazvydas Ignotas <no...@gm...>
+@@ -686,6 +686,10 @@ Grazvydas Ignotas <no...@gm...>
omap3_pandora ARM ARMV7 (OMAP3xx SoC)
@@ -25,7 +25,7 @@ index f8d8559..7b8d537 100644
smdk2400 ARM920T
diff --git a/MAKEALL b/MAKEALL
-index 266e231..0f460bf 100755
+index 3b98f03..f1aa6fc 100755
--- a/MAKEALL
+++ b/MAKEALL
@@ -320,6 +320,7 @@ LIST_ARM7=" \
@@ -37,7 +37,7 @@ index 266e231..0f460bf 100755
ap922_XA10 \
ap926ejs \
diff --git a/boards.cfg b/boards.cfg
-index 3e79c82..43860ce 100644
+index 6827cf3..1b4da54 100644
--- a/boards.cfg
+++ b/boards.cfg
@@ -49,6 +49,7 @@ lpc2292sodimm arm arm720t - -
diff --git a/patches/u-boot/2011.06/04-apf9328-config.patch b/patches/u-boot/2011.06/05-apf9328-config.patch
similarity index 98%
rename from patches/u-boot/2011.06/04-apf9328-config.patch
rename to patches/u-boot/2011.06/05-apf9328-config.patch
index 3b472e7..a3f9842 100644
--- a/patches/u-boot/2011.06/04-apf9328-config.patch
+++ b/patches/u-boot/2011.06/05-apf9328-config.patch
@@ -1,19 +1,18 @@
-apf9328: add board configuration file
+apf9328: add default board configuration file
-Add apf9328 configuration file
Signed-off-by: Eric Jarrige <eri...@ar...>
---
- include/configs/apf9328.h | 1030 +++++++++++++++++++++++++++++++++++++++++++++
- 1 files changed, 1030 insertions(+), 0 deletions(-)
+ include/configs/apf9328.h | 1034 +++++++++++++++++++++++++++++++++++++++++++++
+ 1 files changed, 1034 insertions(+), 0 deletions(-)
create mode 100644 include/configs/apf9328.h
diff --git a/include/configs/apf9328.h b/include/configs/apf9328.h
new file mode 100644
-index 0000000..b5b5794
+index 0000000..ef5e54a
--- /dev/null
+++ b/include/configs/apf9328.h
-@@ -0,0 +1,1030 @@
+@@ -0,0 +1,1034 @@
+/*
+ * (C) Copyright 2005-2011 ej Armadeus Project <eri...@ar...>
+ *
@@ -56,8 +55,8 @@ index 0000000..b5b5794
+#define CONFIG_ARM920T 1 /* this is an ARM920T CPU */
+#define CONFIG_IMX 1 /* in a Motorola MC9328MXL Chip */
+#define CONFIG_apf9328 1 /* on a Armadeus project board */
-+#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
-+
++#undef CONFIG_USE_IRQ /* don't need use IRQ/FIQ */
++#define CONFIG_SYS_DCACHE_OFF /* make kernel 2.6.29 boot crash */
+/*
+ * Enable the call to misc_init_r() for miscellaneous platform
+ * dependent initialization.
@@ -249,7 +248,7 @@ index 0000000..b5b5794
+
+#define CONFIG_SYS_LONGHELP
+#define CONFIG_SYS_PROMPT "BIOS> " /* prompt string */
-+#define CONFIG_SYS_CBSIZE 256 /* console I/O buffer */
++#define CONFIG_SYS_CBSIZE 2048 /* console I/O buffer */
+#define CONFIG_SYS_PBSIZE (CONFIG_SYS_CBSIZE+sizeof(CONFIG_SYS_PROMPT)+16)
+#define CONFIG_SYS_MAXARGS 16 /* max command args */
+#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE /* bootargs buf size*/
@@ -266,7 +265,6 @@ index 0000000..b5b5794
+#define CONFIG_CMDLINE_TAG 1 /* send commandline to Kernel */
+#define CONFIG_SETUP_MEMORY_TAGS 1 /* send memory definition to kernel */
+#define CONFIG_INITRD_TAG 1 /* send initrd params */
-+#undef CONFIG_VFD /* do not send framebuffer setup */
+
+/*
+ * Malloc pool need to host env + 128 Kb reserve for other allocations.
@@ -422,11 +420,16 @@ index 0000000..b5b5794
+#endif
+
+#define CONFIG_SYS_SDRAM_BASE CONFIG_SYS_SDRAM_1_BASE
++
++/* lowlevel_linit copy U-Boot at CONFIG_SYS_INIT_SP_ADDR (here in RAM) */
++/* making u-boot runnable from flash and also RAM that is usefull to boot */
++/* from serial port and from flash with only one version of U-Boot */
+#ifndef CONFIG_SYS_TEXT_BASE
-+#define CONFIG_SYS_TEXT_BASE 0x08E00000
++#define CONFIG_SYS_TEXT_BASE 0x08000000
+#endif
+
-+#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE + 0x0f00000)
++#define CONFIG_SYS_INIT_SP_ADDR (CONFIG_SYS_SDRAM_BASE \
++ + CONFIG_SYS_SDRAM_1_SIZE - 0x0100000)
+
+/*
+ * Configuration for a maximum 32MB of FLASH memory
diff --git a/patches/u-boot/2011.06/05-mx1-pllclk.patch b/patches/u-boot/2011.06/06-mx1-pllclk.patch
similarity index 79%
rename from patches/u-boot/2011.06/05-mx1-pllclk.patch
rename to patches/u-boot/2011.06/06-mx1-pllclk.patch
index 3a25390..399c80e 100644
--- a/patches/u-boot/2011.06/05-mx1-pllclk.patch
+++ b/patches/u-boot/2011.06/06-mx1-pllclk.patch
@@ -1,15 +1,15 @@
mx1: improve PLL freq computation
Improve PLL freq computation by using the full resolution of the PLL registers
-change an extra print message to debug
Signed-off-by: Eric Jarrige <eri...@ar...>
+Cc: Stefano Babic <sb...@de...>
---
- arch/arm/cpu/arm920t/imx/speed.c | 31 ++++++++++++-------------------
- 1 files changed, 12 insertions(+), 19 deletions(-)
+ arch/arm/cpu/arm920t/imx/speed.c | 29 +++++++++++------------------
+ 1 files changed, 11 insertions(+), 18 deletions(-)
diff --git a/arch/arm/cpu/arm920t/imx/speed.c b/arch/arm/cpu/arm920t/imx/speed.c
-index 1e29698..b8e42bf 100644
+index 1e29698..b1c2bd6 100644
--- a/arch/arm/cpu/arm920t/imx/speed.c
+++ b/arch/arm/cpu/arm920t/imx/speed.c
@@ -36,33 +36,26 @@
@@ -57,12 +57,3 @@ index 1e29698..b8e42bf 100644
}
ulong get_FCLK(void)
-@@ -74,7 +67,7 @@ ulong get_FCLK(void)
- ulong get_HCLK(void)
- {
- u32 bclkdiv = (( CSCR >> 10 ) & 0xf) + 1;
-- printf("bclkdiv: %d\n", bclkdiv);
-+ debug("bclkdiv: %d\n", bclkdiv);
- return get_systemPLLCLK() / bclkdiv;
- }
-
diff --git a/patches/u-boot/2011.06/07-mx1-pllclk-debug.patch b/patches/u-boot/2011.06/07-mx1-pllclk-debug.patch
new file mode 100644
index 0000000..85ef861
--- /dev/null
+++ b/patches/u-boot/2011.06/07-mx1-pllclk-debug.patch
@@ -0,0 +1,22 @@
+mx1: change a printf in speed.c to use debug instead
+
+
+Signed-off-by: Eric Jarrige <eri...@ar...>
+Cc: Stefano Babic <sb...@de...>
+---
+ arch/arm/cpu/arm920t/imx/speed.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/arch/arm/cpu/arm920t/imx/speed.c b/arch/arm/cpu/arm920t/imx/speed.c
+index b1c2bd6..b8e42bf 100644
+--- a/arch/arm/cpu/arm920t/imx/speed.c
++++ b/arch/arm/cpu/arm920t/imx/speed.c
+@@ -67,7 +67,7 @@ ulong get_FCLK(void)
+ ulong get_HCLK(void)
+ {
+ u32 bclkdiv = (( CSCR >> 10 ) & 0xf) + 1;
+- printf("bclkdiv: %d\n", bclkdiv);
++ debug("bclkdiv: %d\n", bclkdiv);
+ return get_systemPLLCLK() / bclkdiv;
+ }
+
diff --git a/patches/u-boot/2011.06/06-DM9000.patch b/patches/u-boot/2011.06/08-DM9000.patch
similarity index 93%
rename from patches/u-boot/2011.06/06-DM9000.patch
rename to patches/u-boot/2011.06/08-DM9000.patch
index 473b0ee..5ea1770 100644
--- a/patches/u-boot/2011.06/06-DM9000.patch
+++ b/patches/u-boot/2011.06/08-DM9000.patch
@@ -1,8 +1,7 @@
-DM9000: change some print message to debug message
-
-change some print message to debug message.
+DM9000: change some printf to use debug instead
Signed-off-by: Eric Jarrige <eri...@ar...>
+Cc: Ben Warren <big...@gm...>
---
drivers/net/dm9000x.c | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/patches/u-boot/2011.06/07-mx1-relocation.patch b/patches/u-boot/2011.06/09-mx1-relocation.patch
similarity index 64%
rename from patches/u-boot/2011.06/07-mx1-relocation.patch
rename to patches/u-boot/2011.06/09-mx1-relocation.patch
index cc01a26..c08eb51 100644
--- a/patches/u-boot/2011.06/07-mx1-relocation.patch
+++ b/patches/u-boot/2011.06/09-mx1-relocation.patch
@@ -1,15 +1,19 @@
mx1: Fix jump to the relocated board_init_r
-- make jump to the relocated board_init_r according to the initial computation
-to support mx1 address mapping change at power on boot
+Jump to the relocated board_init_r according to the initial computation
+and remove computation against current PC addr as relocated address is
+already known and fixed.
+This helps to support CPU that miroor flash to different address at
+power on boot such as iMX1/L
Signed-off-by: Eric Jarrige <eri...@ar...>
+Cc: Stefano Babic <sb...@de...>
---
arch/arm/cpu/arm920t/start.S | 4 +---
1 files changed, 1 insertions(+), 3 deletions(-)
diff --git a/arch/arm/cpu/arm920t/start.S b/arch/arm/cpu/arm920t/start.S
-index 0090f89..46c201a 100644
+index c308420..5c75289 100644
--- a/arch/arm/cpu/arm920t/start.S
+++ b/arch/arm/cpu/arm920t/start.S
@@ -292,9 +292,7 @@ _nand_boot_ofs:
diff --git a/patches/u-boot/2011.06/series b/patches/u-boot/2011.06/series
index d084963..b4e9263 100644
--- a/patches/u-boot/2011.06/series
+++ b/patches/u-boot/2011.06/series
@@ -1,8 +1,10 @@
-# This series applies on GIT commit 03d4ce814d094a148344c663b05bc802abc63a64
-01-mx1-i2c.patch
-02-apf9328.patch
-03-apf9328-makefile.patch
-04-apf9328-config.patch
-05-mx1-pllclk.patch
-06-DM9000.patch
-07-mx1-relocation.patch
+# This series applies on GIT commit ad3f7cf2573433f9a5d2a58ced233e8f6d18a61a
+01-mx1-gpio-mode.patch
+02-mx1-i2c.patch
+03-apf9328.patch
+04-apf9328-makefile.patch
+05-apf9328-config.patch
+06-mx1-pllclk.patch
+07-mx1-pllclk-debug.patch
+08-DM9000.patch
+09-mx1-relocation.patch
hooks/post-receive
--
armadeus
|