diff options
| author | Paul Wassi <p.wassi@gmx.at> | 2016-10-26 11:14:47 +0200 |
|---|---|---|
| committer | John Crispin <john@phrozen.org> | 2016-10-27 12:44:54 +0200 |
| commit | 705240eeb55dda0e30a7f66809628ff316cb0e3d (patch) | |
| tree | 65793b2fa37be472b35057505026b7e9fac811f0 /package/boot/uboot-kirkwood/patches/0003-ARM-kirkwood-fix-cpu-info-for-6282-device-id.patch | |
| parent | d9c37272885eb656b188ee3f98352fcdd5b32708 (diff) | |
| download | upstream-705240eeb55dda0e30a7f66809628ff316cb0e3d.tar.gz upstream-705240eeb55dda0e30a7f66809628ff316cb0e3d.tar.bz2 upstream-705240eeb55dda0e30a7f66809628ff316cb0e3d.zip | |
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>
Diffstat (limited to 'package/boot/uboot-kirkwood/patches/0003-ARM-kirkwood-fix-cpu-info-for-6282-device-id.patch')
| -rw-r--r-- | package/boot/uboot-kirkwood/patches/0003-ARM-kirkwood-fix-cpu-info-for-6282-device-id.patch | 45 |
1 files changed, 0 insertions, 45 deletions
diff --git a/package/boot/uboot-kirkwood/patches/0003-ARM-kirkwood-fix-cpu-info-for-6282-device-id.patch b/package/boot/uboot-kirkwood/patches/0003-ARM-kirkwood-fix-cpu-info-for-6282-device-id.patch deleted file mode 100644 index f92e520c7d..0000000000 --- a/package/boot/uboot-kirkwood/patches/0003-ARM-kirkwood-fix-cpu-info-for-6282-device-id.patch +++ /dev/null @@ -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; - } - |