diff options
author | Tom Rini <trini@konsulko.com> | 2016-05-25 20:22:48 -0400 |
---|---|---|
committer | Tom Rini <trini@konsulko.com> | 2016-05-25 20:22:48 -0400 |
commit | 6523dbf7cce8d8c903346f756e0e41e46ce6d6b9 (patch) | |
tree | 0e099cd46a629e7723ed76d386bfaa8fe16d6453 /board | |
parent | f9a90ace21c52a5a6948b9f3a0d8fe088e47a595 (diff) | |
parent | 4349b55b9953d0bb591f13ca9985edf591348ced (diff) |
Merge branch 'master' of git://git.denx.de/u-boot-mips
Diffstat (limited to 'board')
-rw-r--r-- | board/dbau1x00/Kconfig | 3 | ||||
-rw-r--r-- | board/imgtec/malta/Kconfig | 3 | ||||
-rw-r--r-- | board/imgtec/malta/malta.c | 13 | ||||
-rw-r--r-- | board/microchip/pic32mzda/Kconfig | 3 | ||||
-rw-r--r-- | board/micronas/vct/Kconfig | 3 | ||||
-rw-r--r-- | board/pb1x00/Kconfig | 3 | ||||
-rw-r--r-- | board/qca/ap121/Kconfig | 3 | ||||
-rw-r--r-- | board/qca/ap143/Kconfig | 3 | ||||
-rw-r--r-- | board/qemu-mips/Kconfig | 4 | ||||
-rw-r--r-- | board/tplink/wdr4300/Kconfig | 3 |
10 files changed, 28 insertions, 13 deletions
diff --git a/board/dbau1x00/Kconfig b/board/dbau1x00/Kconfig index b813adb840d..342ec59cb73 100644 --- a/board/dbau1x00/Kconfig +++ b/board/dbau1x00/Kconfig @@ -9,6 +9,9 @@ config SYS_SOC config SYS_CONFIG_NAME default "dbau1x00" +config SYS_TEXT_BASE + default 0xbfc00000 + menu "dbau1x00 board options" choice diff --git a/board/imgtec/malta/Kconfig b/board/imgtec/malta/Kconfig index 4c06d0c0d80..2bb8e8be16e 100644 --- a/board/imgtec/malta/Kconfig +++ b/board/imgtec/malta/Kconfig @@ -9,4 +9,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "malta" +config SYS_TEXT_BASE + default 0xbe000000 + endif diff --git a/board/imgtec/malta/malta.c b/board/imgtec/malta/malta.c index 3a9e7807c69..495504372a0 100644 --- a/board/imgtec/malta/malta.c +++ b/board/imgtec/malta/malta.c @@ -12,7 +12,6 @@ #include <pci_gt64120.h> #include <pci_msc01.h> #include <rtc.h> -#include <serial.h> #include <asm/addrspace.h> #include <asm/io.h> @@ -161,18 +160,6 @@ int misc_init_r(void) return 0; } -struct serial_device *default_serial_console(void) -{ - switch (malta_sys_con()) { - case SYSCON_GT64120: - return &eserial1_device; - - default: - case SYSCON_MSC01: - return &eserial2_device; - } -} - void pci_init_board(void) { pci_dev_t bdf; diff --git a/board/microchip/pic32mzda/Kconfig b/board/microchip/pic32mzda/Kconfig index 8acb3933698..4f08e98b97a 100644 --- a/board/microchip/pic32mzda/Kconfig +++ b/board/microchip/pic32mzda/Kconfig @@ -10,4 +10,7 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "pic32mzdask" +config SYS_TEXT_BASE + default 0x9d004000 + endif diff --git a/board/micronas/vct/Kconfig b/board/micronas/vct/Kconfig index c518079efac..535a77b2a32 100644 --- a/board/micronas/vct/Kconfig +++ b/board/micronas/vct/Kconfig @@ -9,6 +9,9 @@ config SYS_VENDOR config SYS_CONFIG_NAME default "vct" +config SYS_TEXT_BASE + default 0x87000000 + menu "vct board options" choice diff --git a/board/pb1x00/Kconfig b/board/pb1x00/Kconfig index 251db6ab637..236a4108bfc 100644 --- a/board/pb1x00/Kconfig +++ b/board/pb1x00/Kconfig @@ -9,4 +9,7 @@ config SYS_SOC config SYS_CONFIG_NAME default "pb1x00" +config SYS_TEXT_BASE + default 0x83800000 + endif diff --git a/board/qca/ap121/Kconfig b/board/qca/ap121/Kconfig index f7e768ad586..c3ecc8f62ff 100644 --- a/board/qca/ap121/Kconfig +++ b/board/qca/ap121/Kconfig @@ -9,4 +9,7 @@ config SYS_BOARD config SYS_CONFIG_NAME default "ap121" +config SYS_TEXT_BASE + default 0x9f000000 + endif diff --git a/board/qca/ap143/Kconfig b/board/qca/ap143/Kconfig index 4cdac0d06d0..5ea5d6fbb02 100644 --- a/board/qca/ap143/Kconfig +++ b/board/qca/ap143/Kconfig @@ -9,4 +9,7 @@ config SYS_BOARD config SYS_CONFIG_NAME default "ap143" +config SYS_TEXT_BASE + default 0x9f000000 + endif diff --git a/board/qemu-mips/Kconfig b/board/qemu-mips/Kconfig index 18d78b51008..3de1f44a3da 100644 --- a/board/qemu-mips/Kconfig +++ b/board/qemu-mips/Kconfig @@ -7,4 +7,8 @@ config SYS_CONFIG_NAME default "qemu-mips" if 32BIT default "qemu-mips64" if 64BIT +config SYS_TEXT_BASE + default 0xbfc00000 if 32BIT + default 0xffffffffbfc00000 if 64BIT + endif diff --git a/board/tplink/wdr4300/Kconfig b/board/tplink/wdr4300/Kconfig index 902abf560d1..65785bdb9c7 100644 --- a/board/tplink/wdr4300/Kconfig +++ b/board/tplink/wdr4300/Kconfig @@ -12,4 +12,7 @@ config SYS_BOARD config SYS_CONFIG_NAME default "tplink_wdr4300" +config SYS_TEXT_BASE + default 0xa1000000 + endif |