Merge git://git.denx.de/u-boot-dm

This commit is contained in:
Tom Rini
2015-02-13 13:11:09 -05:00
152 changed files with 2813 additions and 394 deletions

View File

@@ -9,4 +9,42 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "canyonlands"
choice BOARD_TYPE
prompt "Select which board to build for"
config CANYONLANDS
bool "Glacier"
help
Select this to build for the Canyonlands 460EX board.
config GLACIER
bool "Glacier"
help
Select this to build for the Glacier 460GT board.
config ARCHES
bool "Arches"
help
Select this to build for the Arches dual 460GT board.
endchoice
config DISPLAY_BOARDINFO
bool
default y
config DM
default y
config DM_SERIAL
default y
config SYS_MALLOC_F
bool
default y
config SYS_MALLOC_F_LEN
hex
default 0x400
endif

View File

@@ -6,3 +6,4 @@ F: include/configs/canyonlands.h
F: configs/arches_defconfig
F: configs/canyonlands_defconfig
F: configs/glacier_defconfig
F: configs/glacier_ramboot_defconfig

View File

@@ -8,8 +8,6 @@
# AMCC 460EX/460GT Evaluation Board (Canyonlands) board
#
PLATFORM_CPPFLAGS += -DCONFIG_440=1
ifeq ($(debug),1)
PLATFORM_CPPFLAGS += -DDEBUG
endif

View File

@@ -0,0 +1,85 @@
/*
* (C) Copyright 2009
* Stefan Roese, DENX Software Engineering, sr@denx.de.
*
* SPDX-License-Identifier: GPL-2.0+
*/
OUTPUT_ARCH(powerpc)
SECTIONS
{
/* Read-only sections, merged into text segment: */
. = + SIZEOF_HEADERS;
.text :
{
_image_copy_start = .;
arch/powerpc/cpu/ppc4xx/start.o (.text*)
board/amcc/canyonlands/init.o (.text*)
*(.text*)
}
_etext = .;
PROVIDE (etext = .);
.rodata :
{
*(SORT_BY_ALIGNMENT(SORT_BY_NAME(.rodata*)))
}
/* Read-write section, merged into data segment: */
. = (. + 0x00FF) & 0xFFFFFF00;
_erotext = .;
PROVIDE (erotext = .);
.reloc :
{
KEEP(*(.got))
_GOT2_TABLE_ = .;
KEEP(*(.got2))
_FIXUP_TABLE_ = .;
KEEP(*(.fixup))
}
__got2_entries = (_FIXUP_TABLE_ - _GOT2_TABLE_) >>2;
__fixup_entries = (. - _FIXUP_TABLE_)>>2;
.data :
{
*(.data*)
*(.sdata*)
}
_edata = .;
PROVIDE (edata = .);
. = .;
.u_boot_list : {
KEEP(*(SORT(.u_boot_list*)));
}
. = .;
__start___ex_table = .;
__ex_table : { *(__ex_table) }
__stop___ex_table = .;
. = ALIGN(256);
__init_begin = .;
.text.init : { *(.text.init) }
.data.init : {
*(.data.init)
. = ALIGN(256);
LONG(0) LONG(0) /* Extend u-boot.bin to here */
}
__init_end = .;
_end = .;
_image_binary_end = .;
__bss_start = .;
.bss (NOLOAD) :
{
*(.bss*)
*(.sbss*)
*(COMMON)
. = ALIGN(4);
}
__bss_end = . ;
PROVIDE (end = .);
}

View File

@@ -12,4 +12,13 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "cm_t335"
config DM
default y if !SPL_BUILD
config DM_GPIO
default y if !SPL_BUILD
config DM_SERIAL
default y if !SPL_BUILD
endif

View File

@@ -12,4 +12,13 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "pepper"
config DM
default y if !SPL_BUILD
config DM_GPIO
default y if !SPL_BUILD
config DM_SERIAL
default y if !SPL_BUILD
endif

View File

@@ -12,4 +12,13 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "am335x_igep0033"
config DM
default y if !SPL_BUILD
config DM_GPIO
default y if !SPL_BUILD
config DM_SERIAL
default y if !SPL_BUILD
endif

View File

@@ -12,4 +12,13 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "pcm051"
config DM
default y if !SPL_BUILD
config DM_GPIO
default y if !SPL_BUILD
config DM_SERIAL
default y if !SPL_BUILD
endif

View File

@@ -12,4 +12,13 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "s5p_goni"
config DM
default y if !SPL_BUILD
config DM_GPIO
default y if !SPL_BUILD
config DM_SERIAL
default y if !SPL_BUILD
endif

View File

@@ -22,6 +22,9 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "peach-pi"
config DM_CROS_EC
default y
endif
if TARGET_PEACH_PIT
@@ -35,6 +38,9 @@ config SYS_VENDOR
config SYS_CONFIG_NAME
default "peach-pit"
config DM_CROS_EC
default y
endif
if TARGET_SMDK5420

View File

@@ -12,4 +12,13 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "smdkc100"
config DM
default y if !SPL_BUILD
config DM_GPIO
default y if !SPL_BUILD
config DM_SERIAL
default y if !SPL_BUILD
endif

View File

@@ -12,4 +12,13 @@ config SYS_SOC
config SYS_CONFIG_NAME
default "pengwyn"
config DM
default y if !SPL_BUILD
config DM_GPIO
default y if !SPL_BUILD
config DM_SERIAL
default y if !SPL_BUILD
endif

View File

@@ -37,4 +37,20 @@ config NOR_BOOT
booted via NOR. In this case we will enable certain pinmux early
as the ROM only partially sets up pinmux. We also default to using
NOR for environment.
config DM
default y if !SPL_BUILD
config DM_GPIO
default y if DM && !SPL_BUILD
config DM_SERIAL
default y if DM && !SPL_BUILD
config SYS_MALLOC_F
default y if DM && !SPL_BUILD
config SYS_MALLOC_F_LEN
default 0x400 if DM && !SPL_BUILD
endif