uboot-kirkwood: bump to upstream 2016.09.01
Bump U-Boot for Kirkwood to upstream 2016.09.01. Local patches cleaned up and reworked. Signed-off-by: Paul Wassi <p.wassi@gmx.at>v19.07.3_mercusys_ac12_duma
Paul Wassi
8 years ago
committed by
John Crispin
parent
d9c3727288
commit
705240eeb5
@ -1,96 +0,0 @@
|
||||
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
|
||||
@ -1,32 +0,0 @@
|
||||
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)
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
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;
|
||||
}
|
||||
|
||||
@ -1,87 +0,0 @@
|
||||
From: Hans de Goede <hdegoede@redhat.com>
|
||||
Date: Sat, 7 Feb 2015 21:52:40 +0000 (+0100)
|
||||
Subject: Add linux/compiler-gcc5.h to fix builds with gcc5
|
||||
X-Git-Tag: v2015.04-rc2~31
|
||||
X-Git-Url: http://git.denx.de/?p=u-boot.git;a=commitdiff_plain;h=478b02f1a7043b673565075ea5016376f3293b23
|
||||
|
||||
Add linux/compiler-gcc5.h to fix builds with gcc5
|
||||
|
||||
Add linux/compiler-gcc5/h from the kernel sources at:
|
||||
|
||||
commit 5631b8fba640a4ab2f8a954f63a603fa34eda96b
|
||||
Author: Steven Noonan <steven@uplinklabs.net>
|
||||
Date: Sat Oct 25 15:09:42 2014 -0700
|
||||
|
||||
compiler/gcc4+: Remove inaccurate comment about 'asm goto' miscompiles
|
||||
|
||||
Signed-off-by: Hans de Goede <hdegoede@redhat.com>
|
||||
---
|
||||
|
||||
--- /dev/null
|
||||
+++ b/include/linux/compiler-gcc5.h
|
||||
@@ -0,0 +1,65 @@
|
||||
+#ifndef __LINUX_COMPILER_H
|
||||
+#error "Please don't include <linux/compiler-gcc5.h> directly, include <linux/compiler.h> instead."
|
||||
+#endif
|
||||
+
|
||||
+#define __used __attribute__((__used__))
|
||||
+#define __must_check __attribute__((warn_unused_result))
|
||||
+#define __compiler_offsetof(a, b) __builtin_offsetof(a, b)
|
||||
+
|
||||
+/* Mark functions as cold. gcc will assume any path leading to a call
|
||||
+ to them will be unlikely. This means a lot of manual unlikely()s
|
||||
+ are unnecessary now for any paths leading to the usual suspects
|
||||
+ like BUG(), printk(), panic() etc. [but let's keep them for now for
|
||||
+ older compilers]
|
||||
+
|
||||
+ Early snapshots of gcc 4.3 don't support this and we can't detect this
|
||||
+ in the preprocessor, but we can live with this because they're unreleased.
|
||||
+ Maketime probing would be overkill here.
|
||||
+
|
||||
+ gcc also has a __attribute__((__hot__)) to move hot functions into
|
||||
+ a special section, but I don't see any sense in this right now in
|
||||
+ the kernel context */
|
||||
+#define __cold __attribute__((__cold__))
|
||||
+
|
||||
+#define __UNIQUE_ID(prefix) __PASTE(__PASTE(__UNIQUE_ID_, prefix), __COUNTER__)
|
||||
+
|
||||
+#ifndef __CHECKER__
|
||||
+# define __compiletime_warning(message) __attribute__((warning(message)))
|
||||
+# define __compiletime_error(message) __attribute__((error(message)))
|
||||
+#endif /* __CHECKER__ */
|
||||
+
|
||||
+/*
|
||||
+ * Mark a position in code as unreachable. This can be used to
|
||||
+ * suppress control flow warnings after asm blocks that transfer
|
||||
+ * control elsewhere.
|
||||
+ *
|
||||
+ * Early snapshots of gcc 4.5 don't support this and we can't detect
|
||||
+ * this in the preprocessor, but we can live with this because they're
|
||||
+ * unreleased. Really, we need to have autoconf for the kernel.
|
||||
+ */
|
||||
+#define unreachable() __builtin_unreachable()
|
||||
+
|
||||
+/* Mark a function definition as prohibited from being cloned. */
|
||||
+#define __noclone __attribute__((__noclone__))
|
||||
+
|
||||
+/*
|
||||
+ * Tell the optimizer that something else uses this function or variable.
|
||||
+ */
|
||||
+#define __visible __attribute__((externally_visible))
|
||||
+
|
||||
+/*
|
||||
+ * GCC 'asm goto' miscompiles certain code sequences:
|
||||
+ *
|
||||
+ * http://gcc.gnu.org/bugzilla/show_bug.cgi?id=58670
|
||||
+ *
|
||||
+ * Work it around via a compiler barrier quirk suggested by Jakub Jelinek.
|
||||
+ *
|
||||
+ * (asm goto is automatically volatile - the naming reflects this.)
|
||||
+ */
|
||||
+#define asm_volatile_goto(x...) do { asm goto(x); asm (""); } while (0)
|
||||
+
|
||||
+#ifdef CONFIG_ARCH_USE_BUILTIN_BSWAP
|
||||
+#define __HAVE_BUILTIN_BSWAP32__
|
||||
+#define __HAVE_BUILTIN_BSWAP64__
|
||||
+#define __HAVE_BUILTIN_BSWAP16__
|
||||
+#endif /* CONFIG_ARCH_USE_BUILTIN_BSWAP */
|
||||
Loading…
Reference in New Issue