diff options
| author | Tom Rini <trini@konsulko.com> | 2015-08-05 14:12:37 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2015-08-05 14:12:37 -0400 |
| commit | 1a2728ae4faf12874173de156b8a7e66cfbbeae5 (patch) | |
| tree | 9aba8e6c915b341df8ec6077d8ecb28f1eb32b0b /board/intel/minnowmax | |
| parent | dcc7dbc73169bb4e39f27c1d95bbf031ccfc1744 (diff) | |
| parent | 12c7510f17ff29190e52336910e43a50c0d620a6 (diff) | |
| download | talos-obmc-uboot-1a2728ae4faf12874173de156b8a7e66cfbbeae5.tar.gz talos-obmc-uboot-1a2728ae4faf12874173de156b8a7e66cfbbeae5.zip | |
Merge git://git.denx.de/u-boot-x86
Diffstat (limited to 'board/intel/minnowmax')
| -rw-r--r-- | board/intel/minnowmax/Kconfig | 5 | ||||
| -rw-r--r-- | board/intel/minnowmax/minnowmax.c | 12 |
2 files changed, 3 insertions, 14 deletions
diff --git a/board/intel/minnowmax/Kconfig b/board/intel/minnowmax/Kconfig index f2a0b71c44..7e975f9c3a 100644 --- a/board/intel/minnowmax/Kconfig +++ b/board/intel/minnowmax/Kconfig @@ -13,11 +13,12 @@ config SYS_CONFIG_NAME default "minnowmax" config SYS_TEXT_BASE - default 0xfff00000 + default 0xfff00000 if !EFI_STUB + default 0x01110000 if EFI_STUB config BOARD_SPECIFIC_OPTIONS # dummy def_bool y - select X86_RESET_VECTOR + select X86_RESET_VECTOR if !EFI_STUB select INTEL_BAYTRAIL select BOARD_ROMSIZE_KB_8192 diff --git a/board/intel/minnowmax/minnowmax.c b/board/intel/minnowmax/minnowmax.c index 383cae068b..c4f2c33b87 100644 --- a/board/intel/minnowmax/minnowmax.c +++ b/board/intel/minnowmax/minnowmax.c @@ -6,12 +6,7 @@ #include <common.h> #include <asm/gpio.h> -#include <asm/ibmpc.h> -#include <asm/pnp_def.h> #include <netdev.h> -#include <smsc_lpc47m.h> - -#define SERIAL_DEV PNP_DEV(0x2e, 4) int arch_early_init_r(void) { @@ -21,13 +16,6 @@ int arch_early_init_r(void) return 0; } -int board_early_init_f(void) -{ - lpc47m_enable_serial(SERIAL_DEV, UART0_BASE, UART0_IRQ); - - return 0; -} - void setup_pch_gpios(u16 gpiobase, const struct pch_gpio_map *gpio) { return; |
