diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2015-06-09 09:26:43 +0200 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2015-06-09 09:26:43 +0200 |
| commit | 760e652a7aca15c3ba67f3e7ad4488d49f7a629a (patch) | |
| tree | 5ec9c243ed182709876e0b3b5ef307956f9fe46c /arch | |
| parent | 65aa032d1186e3c3149e6d935d55fd48b6645ac2 (diff) | |
| parent | 2bd7bb8972f5cf4b39bea46c5e5c6b3acddab8d7 (diff) | |
| download | barebox-760e652a7aca15c3ba67f3e7ad4488d49f7a629a.tar.gz barebox-760e652a7aca15c3ba67f3e7ad4488d49f7a629a.tar.xz | |
Merge branch 'for-next/mips'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/mips/configs/dlink-dir-320_defconfig | 3 | ||||
| -rw-r--r-- | arch/mips/configs/img-ci20_defconfig | 11 | ||||
| -rw-r--r-- | arch/mips/dts/img-ci20.dts | 15 | ||||
| -rw-r--r-- | arch/mips/mach-bcm47xx/include/mach/debug_ll.h | 14 | ||||
| -rw-r--r-- | arch/mips/mach-xburst/Kconfig | 1 |
5 files changed, 29 insertions, 15 deletions
diff --git a/arch/mips/configs/dlink-dir-320_defconfig b/arch/mips/configs/dlink-dir-320_defconfig index 4c9a06f2b0..61798bf599 100644 --- a/arch/mips/configs/dlink-dir-320_defconfig +++ b/arch/mips/configs/dlink-dir-320_defconfig @@ -2,7 +2,6 @@ CONFIG_BUILTIN_DTB=y CONFIG_BUILTIN_DTB_NAME="dlink-dir-320" CONFIG_MACH_MIPS_BCM47XX=y CONFIG_STACK_SIZE=0x7000 -CONFIG_BROKEN=y CONFIG_EXPERIMENTAL=y CONFIG_HUSH_FANCY_PROMPT=y CONFIG_CMDLINE_EDITING=y @@ -35,9 +34,9 @@ CONFIG_CMD_PING=y CONFIG_CMD_TFTP=y CONFIG_CMD_ECHO_E=y CONFIG_CMD_EDIT=y +CONFIG_CMD_LOGIN=y CONFIG_CMD_MENU=y CONFIG_CMD_MENU_MANAGEMENT=y -CONFIG_CMD_LOGIN=y CONFIG_CMD_PASSWD=y CONFIG_CMD_READLINE=y CONFIG_CMD_TIMEOUT=y diff --git a/arch/mips/configs/img-ci20_defconfig b/arch/mips/configs/img-ci20_defconfig index 6702c88b65..28319c523f 100644 --- a/arch/mips/configs/img-ci20_defconfig +++ b/arch/mips/configs/img-ci20_defconfig @@ -28,15 +28,18 @@ CONFIG_CMD_UIMAGE=y CONFIG_CMD_MD5SUM=y CONFIG_CMD_GETOPT=y CONFIG_CMD_SLEEP=y +CONFIG_CMD_DHCP=y +CONFIG_CMD_MIITOOL=y +CONFIG_CMD_PING=y +CONFIG_CMD_TFTP=y CONFIG_CMD_EDIT=y CONFIG_CMD_GPIO=y CONFIG_CMD_OF_NODE=y CONFIG_CMD_OF_PROPERTY=y CONFIG_CMD_OFTREE=y +CONFIG_NET=y CONFIG_OFDEVICE=y +CONFIG_DRIVER_NET_DM9K=y # CONFIG_SPI is not set -CONFIG_CLOCKSOURCE_DUMMY=y CONFIG_CLOCKSOURCE_DUMMY_RATE=3500 -CONFIG_DIGEST_SHA1_GENERIC=y -CONFIG_DIGEST_SHA224_GENERIC=y -CONFIG_DIGEST_SHA256_GENERIC=y +CONFIG_FS_TFTP=y diff --git a/arch/mips/dts/img-ci20.dts b/arch/mips/dts/img-ci20.dts index f2022dd273..da2a5bf625 100644 --- a/arch/mips/dts/img-ci20.dts +++ b/arch/mips/dts/img-ci20.dts @@ -28,6 +28,21 @@ device_type = "memory"; reg = <0x0 0x10000000>; }; + + board { + #address-cells = <1>; + #size-cells = <1>; + compatible = "simple-bus"; + ranges = <>; + + dm9000@16000000 { + compatible = "davicom,dm9000"; + davicom,no-eeprom; + + reg = <0x16000000 1 /* addr */ + 0x16000002 1>; /* data */ + }; + }; }; &uart0 { diff --git a/arch/mips/mach-bcm47xx/include/mach/debug_ll.h b/arch/mips/mach-bcm47xx/include/mach/debug_ll.h index 9927b4d945..3e74e0f670 100644 --- a/arch/mips/mach-bcm47xx/include/mach/debug_ll.h +++ b/arch/mips/mach-bcm47xx/include/mach/debug_ll.h @@ -24,16 +24,12 @@ #include <io.h> #include <mach/hardware.h> -#define rbr 0 -#define lsr 5 -#define LSR_THRE 0x20 /* Xmit holding register empty */ +#define DEBUG_LL_UART_SHIFT 0 -static __inline__ void PUTC_LL(char ch) -{ - void *base = (void *)DEBUG_LL_UART_ADDR; +#define DEBUG_LL_UART_CLK (25804800 / 16) +#define DEBUG_LL_UART_BPS CONFIG_BAUDRATE +#define DEBUG_LL_UART_DIVISOR (DEBUG_LL_UART_CLK / DEBUG_LL_UART_BPS) - while (!(__raw_readb(base + lsr) & LSR_THRE)); - __raw_writeb(ch, base + rbr); -} +#include <asm/debug_ll_ns16550.h> #endif /* __INCLUDE_ARCH_DEBUG_LL_H__ */ diff --git a/arch/mips/mach-xburst/Kconfig b/arch/mips/mach-xburst/Kconfig index 2598c41cdf..fd106fefe0 100644 --- a/arch/mips/mach-xburst/Kconfig +++ b/arch/mips/mach-xburst/Kconfig @@ -27,6 +27,7 @@ config BOARD_RZX50 config BOARD_CI20 bool "Imagination Creator CI20" select CPU_JZ4780 + select HAS_DM9000 endchoice |