uboot-kirkwood: bump to 2014.10
Signed-off-by: Luka Perkov <luka@openwrt.org> SVN-Revision: 43436v19.07.3_mercusys_ac12_duma
Luka Perkov
10 years ago
parent
201af1b219
commit
c595a59680
@ -0,0 +1,96 @@
|
||||
From 76a9fed9e5580945827a82963ac7315186fd0ebe Mon Sep 17 00:00:00 2001
|
||||
From: Luka Perkov <luka@openwrt.org>
|
||||
Date: Mon, 11 Nov 2013 06:45:44 +0100
|
||||
Subject: [PATCH 1/9] cosmetic: kirkwood: style fixes in kwbimage.cfg files
|
||||
|
||||
When diffing through the changes only the relevant changes
|
||||
should be displayed.
|
||||
|
||||
Signed-off-by: Luka Perkov <luka@openwrt.org>
|
||||
---
|
||||
board/iomega/iconnect/kwbimage.cfg | 4 ++--
|
||||
board/raidsonic/ib62x0/kwbimage.cfg | 22 +++++++++++-----------
|
||||
2 files changed, 13 insertions(+), 13 deletions(-)
|
||||
|
||||
--- a/board/iomega/iconnect/kwbimage.cfg
|
||||
+++ b/board/iomega/iconnect/kwbimage.cfg
|
||||
@@ -20,7 +20,7 @@ NAND_PAGE_SIZE 0x0800
|
||||
# Configure RGMII-0 interface pad voltage to 1.8V
|
||||
DATA 0xffd100e0 0x1b1b1b9b
|
||||
|
||||
-#Dram initalization for SINGLE x16 CL=5 @ 400MHz
|
||||
+# Dram initalization for SINGLE x16 CL=5 @ 400MHz
|
||||
DATA 0xffd01400 0x43000c30 # DDR Configuration register
|
||||
# bit13-0: 0xc30, (3120 DDR2 clks refresh rate)
|
||||
# bit23-14: 0x0,
|
||||
@@ -87,7 +87,7 @@ DATA 0xffd0141c 0x00000c52 # DDR Mode
|
||||
# bit6-4: 0x4, CL=5
|
||||
# bit7: 0x0, TestMode=0 normal
|
||||
# bit8: 0x0, DLL reset=0 normal
|
||||
-# bit11-9: 0x6, auto-precharge write recovery ????????????
|
||||
+# bit11-9: 0x6, auto-precharge write recovery
|
||||
# bit12: 0x0, PD must be zero
|
||||
# bit31-13: 0x0, required
|
||||
|
||||
--- a/board/raidsonic/ib62x0/kwbimage.cfg
|
||||
+++ b/board/raidsonic/ib62x0/kwbimage.cfg
|
||||
@@ -11,7 +11,7 @@
|
||||
#
|
||||
|
||||
# Boot Media configurations
|
||||
-BOOT_FROM nand # change from nand to uart if building UART image
|
||||
+BOOT_FROM nand
|
||||
NAND_ECC_MODE default
|
||||
NAND_PAGE_SIZE 0x0800
|
||||
|
||||
@@ -21,12 +21,12 @@ NAND_PAGE_SIZE 0x0800
|
||||
# Configure RGMII-0 interface pad voltage to 1.8V
|
||||
DATA 0xffd100e0 0x1b1b1b9b
|
||||
|
||||
-#Dram initalization for SINGLE x16 CL=5 @ 400MHz
|
||||
+# Dram initalization for SINGLE x16 CL=5 @ 400MHz
|
||||
DATA 0xffd01400 0x43000c30 # DDR Configuration register
|
||||
# bit13-0: 0xc30, (3120 DDR2 clks refresh rate)
|
||||
# bit23-14: 0x0,
|
||||
-# bit24: 0x1, enable exit self refresh mode on DDR access
|
||||
-# bit25: 0x1, required
|
||||
+# bit24: 0x1, enable exit self refresh mode on DDR access
|
||||
+# bit25: 0x1, required
|
||||
# bit29-26: 0x0,
|
||||
# bit31-30: 0x1,
|
||||
|
||||
@@ -64,10 +64,10 @@ DATA 0xffd01410 0x0000000c # DDR Address
|
||||
# bit3-2: 11, Cs0size (1Gb)
|
||||
# bit5-4: 00, Cs1width (x8)
|
||||
# bit7-6: 11, Cs1size (1Gb)
|
||||
-# bit9-8: 00, Cs2width (nonexistent
|
||||
-# bit11-10: 00, Cs2size (nonexistent
|
||||
-# bit13-12: 00, Cs3width (nonexistent
|
||||
-# bit15-14: 00, Cs3size (nonexistent
|
||||
+# bit9-8: 00, Cs2width (nonexistent)
|
||||
+# bit11-10: 00, Cs2size (nonexistent)
|
||||
+# bit13-12: 00, Cs3width (nonexistent)
|
||||
+# bit15-14: 00, Cs3size (nonexistent)
|
||||
# bit16: 0, Cs0AddrSel
|
||||
# bit17: 0, Cs1AddrSel
|
||||
# bit18: 0, Cs2AddrSel
|
||||
@@ -88,7 +88,7 @@ DATA 0xffd0141c 0x00000c52 # DDR Mode
|
||||
# bit6-4: 0x4, CL=5
|
||||
# bit7: 0x0, TestMode=0 normal
|
||||
# bit8: 0x0, DLL reset=0 normal
|
||||
-# bit11-9: 0x6, auto-precharge write recovery ????????????
|
||||
+# bit11-9: 0x6, auto-precharge write recovery
|
||||
# bit12: 0x0, PD must be zero
|
||||
# bit31-13: 0x0, required
|
||||
|
||||
@@ -148,8 +148,8 @@ DATA 0xffd0149c 0x0000e803 # CPU ODT Con
|
||||
DATA 0xffd01480 0x00000001 # DDR Initialization Control
|
||||
# bit0: 0x1, enable DDR init upon this register write
|
||||
|
||||
-DATA 0xFFD20134 0x66666666 # L2 RAM Timing 0 Register
|
||||
-DATA 0xFFD20138 0x66666666 # L2 RAM Timing 1 Register
|
||||
+DATA 0xffd20134 0x66666666 # L2 RAM Timing 0 Register
|
||||
+DATA 0xffd20138 0x66666666 # L2 RAM Timing 1 Register
|
||||
|
||||
# End of Header extension
|
||||
DATA 0x0 0x0
|
||||
@ -0,0 +1,32 @@
|
||||
From 292d4cf9257921912e8ea352687c977208e7553d Mon Sep 17 00:00:00 2001
|
||||
From: Luka Perkov <luka@openwrt.org>
|
||||
Date: Mon, 11 Nov 2013 07:27:53 +0100
|
||||
Subject: [PATCH 2/9] kirkwood: define empty CONFIG_MVGBE_PORTS by default
|
||||
|
||||
Each board with defines it's own set of values. If we do not define
|
||||
CONFIG_MVGBE_PORTS we will hit following error:
|
||||
|
||||
mvgbe.c: In function 'mvgbe_initialize':
|
||||
mvgbe.c:700:34: error: 'CONFIG_MVGBE_PORTS' undeclared (first use in this function)
|
||||
u8 used_ports[MAX_MVGBE_DEVS] = CONFIG_MVGBE_PORTS;
|
||||
|
||||
This patch fixes above described problem.
|
||||
|
||||
Signed-off-by: Luka Perkov <luka@openwrt.org>
|
||||
---
|
||||
drivers/net/mvgbe.c | 4 ++++
|
||||
1 file changed, 4 insertions(+)
|
||||
|
||||
--- a/drivers/net/mvgbe.c
|
||||
+++ b/drivers/net/mvgbe.c
|
||||
@@ -35,6 +35,10 @@
|
||||
|
||||
DECLARE_GLOBAL_DATA_PTR;
|
||||
|
||||
+#ifndef CONFIG_MVGBE_PORTS
|
||||
+# define CONFIG_MVGBE_PORTS {0, 0}
|
||||
+#endif
|
||||
+
|
||||
#define MV_PHY_ADR_REQUEST 0xee
|
||||
#define MVGBE_SMI_REG (((struct mvgbe_registers *)MVGBE0_BASE)->smi)
|
||||
|
||||
@ -0,0 +1,45 @@
|
||||
From fa0ece2cc571ba1ccb9d1e0a8d337417c032576e Mon Sep 17 00:00:00 2001
|
||||
From: Luka Perkov <luka@openwrt.org>
|
||||
Date: Mon, 23 Dec 2013 01:23:07 +0100
|
||||
Subject: [PATCH 3/9] ARM: kirkwood: fix cpu info for 6282 device id
|
||||
|
||||
Signed-off-by: Luka Perkov <luka@openwrt.org>
|
||||
CC: Prafulla Wadaskar <prafulla@marvell.com>
|
||||
---
|
||||
arch/arm/cpu/arm926ejs/kirkwood/cpu.c | 11 ++++++++---
|
||||
1 file changed, 8 insertions(+), 3 deletions(-)
|
||||
|
||||
--- a/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
|
||||
+++ b/arch/arm/cpu/arm926ejs/kirkwood/cpu.c
|
||||
@@ -253,7 +253,7 @@ static void kw_sysrst_check(void)
|
||||
#if defined(CONFIG_DISPLAY_CPUINFO)
|
||||
int print_cpuinfo(void)
|
||||
{
|
||||
- char *rev;
|
||||
+ char *rev = "??";
|
||||
u16 devid = (readl(KW_REG_PCIE_DEVID) >> 16) & 0xffff;
|
||||
u8 revid = readl(KW_REG_PCIE_REVID) & 0xff;
|
||||
|
||||
@@ -264,7 +264,13 @@ int print_cpuinfo(void)
|
||||
|
||||
switch (revid) {
|
||||
case 0:
|
||||
- rev = "Z0";
|
||||
+ if (devid == 0x6281)
|
||||
+ rev = "Z0";
|
||||
+ else if (devid == 0x6282)
|
||||
+ rev = "A0";
|
||||
+ break;
|
||||
+ case 1:
|
||||
+ rev = "A1";
|
||||
break;
|
||||
case 2:
|
||||
rev = "A0";
|
||||
@@ -273,7 +279,6 @@ int print_cpuinfo(void)
|
||||
rev = "A1";
|
||||
break;
|
||||
default:
|
||||
- rev = "??";
|
||||
break;
|
||||
}
|
||||
|
||||
@ -0,0 +1,27 @@
|
||||
From 280b03ba28b4287de677d4c4b097918364395b5e Mon Sep 17 00:00:00 2001
|
||||
From: Luka Perkov <luka@openwrt.org>
|
||||
Date: Wed, 2 Jul 2014 01:47:23 +0200
|
||||
Subject: [PATCH 4/9] kirkwood: ib62x0: add CONFIG_SYS_GENERIC_BOARD define
|
||||
|
||||
Signed-off-by: Luka Perkov <luka@openwrt.org>
|
||||
CC: Prafulla Wadaskar <prafulla@marvell.com>
|
||||
CC: Stefan Roese <sr@denx.de>
|
||||
---
|
||||
This is patch was sent already in July:
|
||||
|
||||
http://lists.denx.de/pipermail/u-boot/2014-July/182900.html
|
||||
---
|
||||
include/configs/ib62x0.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/include/configs/ib62x0.h
|
||||
+++ b/include/configs/ib62x0.h
|
||||
@@ -9,6 +9,8 @@
|
||||
#ifndef _CONFIG_IB62x0_H
|
||||
#define _CONFIG_IB62x0_H
|
||||
|
||||
+#define CONFIG_SYS_GENERIC_BOARD
|
||||
+
|
||||
/*
|
||||
* Version number information
|
||||
*/
|
||||
@ -0,0 +1,23 @@
|
||||
From 5f9e6f640098e6963ff9b470cd5d2ab9f6a3579e Mon Sep 17 00:00:00 2001
|
||||
From: Luka Perkov <luka@openwrt.org>
|
||||
Date: Sun, 30 Nov 2014 02:40:37 +0100
|
||||
Subject: [PATCH 5/9] kirkwood: dockstar: add CONFIG_SYS_GENERIC_BOARD define
|
||||
|
||||
Signed-off-by: Luka Perkov <luka@openwrt.org>
|
||||
CC: Prafulla Wadaskar <prafulla@marvell.com>
|
||||
CC: Stefan Roese <sr@denx.de>
|
||||
---
|
||||
include/configs/dockstar.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/include/configs/dockstar.h
|
||||
+++ b/include/configs/dockstar.h
|
||||
@@ -12,6 +12,8 @@
|
||||
#ifndef _CONFIG_DOCKSTAR_H
|
||||
#define _CONFIG_DOCKSTAR_H
|
||||
|
||||
+#define CONFIG_SYS_GENERIC_BOARD
|
||||
+
|
||||
/*
|
||||
* Version number information
|
||||
*/
|
||||
@ -0,0 +1,23 @@
|
||||
From 0d0a6606396f0cc1a4f2966d167ef9e85d533650 Mon Sep 17 00:00:00 2001
|
||||
From: Luka Perkov <luka@openwrt.org>
|
||||
Date: Sun, 30 Nov 2014 02:40:51 +0100
|
||||
Subject: [PATCH 6/9] kirkwood: goflexhome: add CONFIG_SYS_GENERIC_BOARD define
|
||||
|
||||
Signed-off-by: Luka Perkov <luka@openwrt.org>
|
||||
CC: Prafulla Wadaskar <prafulla@marvell.com>
|
||||
CC: Stefan Roese <sr@denx.de>
|
||||
---
|
||||
include/configs/goflexhome.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/include/configs/goflexhome.h
|
||||
+++ b/include/configs/goflexhome.h
|
||||
@@ -15,6 +15,8 @@
|
||||
#ifndef _CONFIG_GOFLEXHOME_H
|
||||
#define _CONFIG_GOFLEXHOME_H
|
||||
|
||||
+#define CONFIG_SYS_GENERIC_BOARD
|
||||
+
|
||||
/*
|
||||
* Version number information
|
||||
*/
|
||||
@ -0,0 +1,23 @@
|
||||
From 45ba20427135e526cfa528773de0cfe215f4dc40 Mon Sep 17 00:00:00 2001
|
||||
From: Luka Perkov <luka@openwrt.org>
|
||||
Date: Sun, 30 Nov 2014 02:41:04 +0100
|
||||
Subject: [PATCH 7/9] kirkwood: iconnect: add CONFIG_SYS_GENERIC_BOARD define
|
||||
|
||||
Signed-off-by: Luka Perkov <luka@openwrt.org>
|
||||
CC: Prafulla Wadaskar <prafulla@marvell.com>
|
||||
CC: Stefan Roese <sr@denx.de>
|
||||
---
|
||||
include/configs/iconnect.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/include/configs/iconnect.h
|
||||
+++ b/include/configs/iconnect.h
|
||||
@@ -9,6 +9,8 @@
|
||||
#ifndef _CONFIG_ICONNECT_H
|
||||
#define _CONFIG_ICONNECT_H
|
||||
|
||||
+#define CONFIG_SYS_GENERIC_BOARD
|
||||
+
|
||||
/*
|
||||
* Version number information
|
||||
*/
|
||||
@ -0,0 +1,23 @@
|
||||
From bd862f4e7a559e38763a5280e35bf7ff14b535f1 Mon Sep 17 00:00:00 2001
|
||||
From: Luka Perkov <luka@openwrt.org>
|
||||
Date: Sun, 30 Nov 2014 02:41:19 +0100
|
||||
Subject: [PATCH 8/9] kirkwood: pogo_e02: add CONFIG_SYS_GENERIC_BOARD define
|
||||
|
||||
Signed-off-by: Luka Perkov <luka@openwrt.org>
|
||||
CC: Prafulla Wadaskar <prafulla@marvell.com>
|
||||
CC: Stefan Roese <sr@denx.de>
|
||||
---
|
||||
include/configs/pogo_e02.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/include/configs/pogo_e02.h
|
||||
+++ b/include/configs/pogo_e02.h
|
||||
@@ -13,6 +13,8 @@
|
||||
#ifndef _CONFIG_POGO_E02_H
|
||||
#define _CONFIG_POGO_E02_H
|
||||
|
||||
+#define CONFIG_SYS_GENERIC_BOARD
|
||||
+
|
||||
/*
|
||||
* Machine type definition and ID
|
||||
*/
|
||||
@ -0,0 +1,23 @@
|
||||
From 787e23179708ddad7ecd9dcd6c841546689864b0 Mon Sep 17 00:00:00 2001
|
||||
From: Luka Perkov <luka@openwrt.org>
|
||||
Date: Sun, 30 Nov 2014 02:41:49 +0100
|
||||
Subject: [PATCH 9/9] kirkwood: sheevaplug: add CONFIG_SYS_GENERIC_BOARD define
|
||||
|
||||
Signed-off-by: Luka Perkov <luka@openwrt.org>
|
||||
CC: Prafulla Wadaskar <prafulla@marvell.com>
|
||||
CC: Stefan Roese <sr@denx.de>
|
||||
---
|
||||
include/configs/sheevaplug.h | 2 ++
|
||||
1 file changed, 2 insertions(+)
|
||||
|
||||
--- a/include/configs/sheevaplug.h
|
||||
+++ b/include/configs/sheevaplug.h
|
||||
@@ -10,6 +10,8 @@
|
||||
#ifndef _CONFIG_SHEEVAPLUG_H
|
||||
#define _CONFIG_SHEEVAPLUG_H
|
||||
|
||||
+#define CONFIG_SYS_GENERIC_BOARD
|
||||
+
|
||||
/*
|
||||
* Version number information
|
||||
*/
|
||||
Loading…
Reference in New Issue