Changeset 46181


Ignore:
Timestamp:
2015-07-05T13:28:46+02:00 (3 years ago)
Author:
jogo
Message:

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@…>

Location:
trunk/target/linux/brcm63xx
Files:
1 added
1 deleted
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/target/linux/brcm63xx/config-4.1

    r46113 r46181  
    145145CONFIG_MDIO_BOARDINFO=y 
    146146CONFIG_MIPS=y 
    147 CONFIG_MIPS_APPENDED_DTB=y 
    148147# CONFIG_MIPS_HUGE_TLB_SUPPORT is not set 
    149148CONFIG_MIPS_L1_CACHE_SHIFT=4 
    150149CONFIG_MIPS_L1_CACHE_SHIFT_4=y 
    151150# CONFIG_MIPS_MACHINE is not set 
     151# CONFIG_MIPS_NO_APPENDED_DTB is not set 
     152CONFIG_MIPS_RAW_APPENDED_DTB=y 
    152153CONFIG_MODULES_USE_ELF_REL=y 
    153154CONFIG_MODULE_FORCE_LOAD=y 
  • trunk/target/linux/brcm63xx/patches-4.1/367-MIPS-BCM63XX-add-support-for-loading-DTB.patch

    r46113 r46181  
    1 From db896341299cbcb703821228574ba9b79b6a3565 Mon Sep 17 00:00:00 2001 
     1From 26546e5499d98616322fb3472b977e2e86603f3a Mon Sep 17 00:00:00 2001 
    22From: Jonas Gorski <jogo@openwrt.org> 
    33Date: Tue, 24 Jun 2014 10:57:51 +0200 
    44Subject: [PATCH 45/48] MIPS: BCM63XX: add support for loading DTB 
    55 
     6Signed-off-by: Jonas Gorski <jogo@openwrt.org> 
    67--- 
    7  arch/mips/bcm63xx/boards/Kconfig        |  4 ++++ 
    8  arch/mips/bcm63xx/boards/board_common.c | 34 +++++++++++++++++++++++++++++++++ 
    9  2 files changed, 38 insertions(+) 
     8 arch/mips/bcm63xx/boards/Kconfig        |    4 ++++ 
     9 arch/mips/bcm63xx/boards/board_common.c |   34 +++++++++++++++++++++++++++++++ 
     10 arch/mips/bcm63xx/prom.c                |    6 ++++++ 
     11 3 files changed, 44 insertions(+) 
    1012 
    1113--- a/arch/mips/bcm63xx/boards/Kconfig 
     
    9597                bcm63xx_uart_register(0); 
    9698  
     99--- a/arch/mips/bcm63xx/prom.c 
     100+++ b/arch/mips/bcm63xx/prom.c 
     101@@ -8,6 +8,7 @@ 
     102  
     103 #include <linux/init.h> 
     104 #include <linux/bootmem.h> 
     105+#include <linux/of_fdt.h> 
     106 #include <linux/smp.h> 
     107 #include <asm/bootinfo.h> 
     108 #include <asm/bmips.h> 
     109@@ -23,6 +24,11 @@ void __init prom_init(void) 
     110 { 
     111        u32 reg, mask; 
     112  
     113+#if CONFIG_OF 
     114+       if (fw_arg0 == -2) 
     115+               early_init_dt_verify((void *)fw_arg1); 
     116+#endif 
     117+ 
     118        bcm63xx_cpu_init(); 
     119  
     120        /* stop any running watchdog */ 
Note: See TracChangeset for help on using the changeset viewer.