diff options
| author | Jonas Gorski <jogo@openwrt.org> | 2015-07-05 11:28:46 +0000 |
|---|---|---|
| committer | Jonas Gorski <jogo@openwrt.org> | 2015-07-05 11:28:46 +0000 |
| commit | 761fc3f0353cd404b647d88cb1de05dbc9fd49bb (patch) | |
| tree | 4b587ed4c4f6e188b36695813fbc5ff231721b86 /target/linux/brcm63xx/patches-4.1/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch | |
| parent | 5e3c3d47885fd744d84ba3abf3cfc0d6a9ea4f6c (diff) | |
| download | upstream-761fc3f0353cd404b647d88cb1de05dbc9fd49bb.tar.gz upstream-761fc3f0353cd404b647d88cb1de05dbc9fd49bb.tar.bz2 upstream-761fc3f0353cd404b647d88cb1de05dbc9fd49bb.zip | |
brcm63xx: 4.1: switch to upstream UHI interface
Replace the appended dtb patch with the upstream accepted version and
update the code to work with the changed interface.
Signed-off-by: Jonas Gorski <jogo@openwrt.org>
SVN-Revision: 46181
Diffstat (limited to 'target/linux/brcm63xx/patches-4.1/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch')
| -rw-r--r-- | target/linux/brcm63xx/patches-4.1/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch | 32 |
1 files changed, 28 insertions, 4 deletions
diff --git a/target/linux/brcm63xx/patches-4.1/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch b/target/linux/brcm63xx/patches-4.1/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch index 577df55d0e..26f7f51647 100644 --- a/target/linux/brcm63xx/patches-4.1/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch +++ b/target/linux/brcm63xx/patches-4.1/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch @@ -1,12 +1,14 @@ -From db896341299cbcb703821228574ba9b79b6a3565 Mon Sep 17 00:00:00 2001 +From 26546e5499d98616322fb3472b977e2e86603f3a Mon Sep 17 00:00:00 2001 From: Jonas Gorski <jogo@openwrt.org> Date: Tue, 24 Jun 2014 10:57:51 +0200 Subject: [PATCH 45/48] MIPS: BCM63XX: add support for loading DTB +Signed-off-by: Jonas Gorski <jogo@openwrt.org> --- - arch/mips/bcm63xx/boards/Kconfig | 4 ++++ - arch/mips/bcm63xx/boards/board_common.c | 34 +++++++++++++++++++++++++++++++++ - 2 files changed, 38 insertions(+) + arch/mips/bcm63xx/boards/Kconfig | 4 ++++ + arch/mips/bcm63xx/boards/board_common.c | 34 +++++++++++++++++++++++++++++++ + arch/mips/bcm63xx/prom.c | 6 ++++++ + 3 files changed, 44 insertions(+) --- a/arch/mips/bcm63xx/boards/Kconfig +++ b/arch/mips/bcm63xx/boards/Kconfig @@ -94,3 +96,25 @@ Subject: [PATCH 45/48] MIPS: BCM63XX: add support for loading DTB if (board.has_uart0) bcm63xx_uart_register(0); +--- a/arch/mips/bcm63xx/prom.c ++++ b/arch/mips/bcm63xx/prom.c +@@ -8,6 +8,7 @@ + + #include <linux/init.h> + #include <linux/bootmem.h> ++#include <linux/of_fdt.h> + #include <linux/smp.h> + #include <asm/bootinfo.h> + #include <asm/bmips.h> +@@ -23,6 +24,11 @@ void __init prom_init(void) + { + u32 reg, mask; + ++#if CONFIG_OF ++ if (fw_arg0 == -2) ++ early_init_dt_verify((void *)fw_arg1); ++#endif ++ + bcm63xx_cpu_init(); + + /* stop any running watchdog */ |