redonkable
/
remarkable-uboot
1
0
Fork 0
Code Releases Activity

Merge branch 'u-boot/master' into 'u-boot-arm/master' 

Conflicts:
	Makefile
	drivers/net/npe/Makefile

These two conflicts arise from commit 0b2d3f20
("ARM: NET: Remove the IXP NPE ethernet driver") and are
resolved by deleting the drivers/net/npe/Makefile file
and removing the CONFIG_IXP4XX_NPE line from Makefile.
utp
Albert ARIBAUD 2014-02-20 13:16:05 +01:00
parent e7538fee99 0a8e823ad0
commit 3e11350255
283 changed files with 4364 additions and 2578 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

31
.gitignore vendored
View File

@ -5,16 +5,20 @@
# #
# Normal rules # Normal rules
# #
.*
*.rej
*.orig
*.a
*.o *.o
*.o.*
*.a
*.s
*.su *.su
*~ *.mod.c
*.i
*.lst
*.order
*.elf
*.swp *.swp
*.patch
*.bin *.bin
*.patch
*.cfgtmp *.cfgtmp
*.dts.tmp *.dts.tmp
@ -24,12 +28,10 @@
# #
# Top-level generic files # Top-level generic files
# #
/MLO* /MLO*
/SPL /SPL
/System.map /System.map
/u-boot /u-boot
/u-boot.elf
/u-boot.hex /u-boot.hex
/u-boot.imx /u-boot.imx
/u-boot-with-spl.imx /u-boot-with-spl.imx
@ -46,14 +48,18 @@
/u-boot.lds /u-boot.lds
/u-boot.ubl /u-boot.ubl
/u-boot.ais /u-boot.ais
/u-boot.dtb
/u-boot.sb /u-boot.sb
#
# git files that we don't want to ignore even it they are dot-files
#
!.gitignore
!.mailmap
# #
# Generated files # Generated files
# #
*.depend*
/LOG /LOG
/errlog /errlog
/reloc_off /reloc_off
@ -65,7 +71,6 @@
/include/generated/ /include/generated/
/include/spl-autoconf.mk /include/spl-autoconf.mk
/include/tpl-autoconf.mk /include/tpl-autoconf.mk
asm-offsets.s
# stgit generated dirs # stgit generated dirs
patches-* patches-*
@ -91,3 +96,7 @@ GPATH
GRTAGS GRTAGS
GSYMS GSYMS
GTAGS GTAGS
*.orig
*~
\#*#

8
MAKEALL
View File

@ -672,8 +672,6 @@ build_target() {
output_dir="${OUTPUT_PREFIX}" output_dir="${OUTPUT_PREFIX}"
fi fi
export BUILD_DIR="${output_dir}"
target_arch=$(get_target_arch ${target}) target_arch=$(get_target_arch ${target})
eval cross_toolchain=\$CROSS_COMPILE_`echo $target_arch | tr '[:lower:]' '[:upper:]'` eval cross_toolchain=\$CROSS_COMPILE_`echo $target_arch | tr '[:lower:]' '[:upper:]'`
if [ "${cross_toolchain}" ] ; then if [ "${cross_toolchain}" ] ; then
@ -684,6 +682,10 @@ build_target() {
MAKE=make MAKE=make
fi fi
if [ "${output_dir}" != "." ] ; then
MAKE="${MAKE} O=${output_dir}"
fi
${MAKE} distclean >/dev/null ${MAKE} distclean >/dev/null
${MAKE} -s ${target}_config ${MAKE} -s ${target}_config
@ -698,7 +700,7 @@ build_target() {
if [ $BUILD_MANY == 1 ] ; then if [ $BUILD_MANY == 1 ] ; then
trap - TERM trap - TERM
${MAKE} -s tidy ${MAKE} -s clean
if [ -s ${LOG_DIR}/${target}.ERR ] ; then if [ -s ${LOG_DIR}/${target}.ERR ] ; then
cp ${LOG_DIR}/${target}.ERR ${OUTPUT_PREFIX}/ERR/${target} cp ${LOG_DIR}/${target}.ERR ${OUTPUT_PREFIX}/ERR/${target}

1361
Makefile
View File

File diff suppressed because it is too large Load Diff

4
README
View File

@ -922,6 +922,8 @@ The following options need to be configured:
CONFIG_CMD_EXPORTENV * export the environment CONFIG_CMD_EXPORTENV * export the environment
CONFIG_CMD_EXT2 * ext2 command support CONFIG_CMD_EXT2 * ext2 command support
CONFIG_CMD_EXT4 * ext4 command support CONFIG_CMD_EXT4 * ext4 command support
CONFIG_CMD_FS_GENERIC * filesystem commands (e.g. load, ls)
that work for multiple fs types
CONFIG_CMD_SAVEENV saveenv CONFIG_CMD_SAVEENV saveenv
CONFIG_CMD_FDC * Floppy Disk Support CONFIG_CMD_FDC * Floppy Disk Support
CONFIG_CMD_FAT * FAT command support CONFIG_CMD_FAT * FAT command support
@ -2847,7 +2849,7 @@ CBFS (Coreboot Filesystem) support
CONFIG_RSA CONFIG_RSA
This enables the RSA algorithm used for FIT image verification This enables the RSA algorithm used for FIT image verification
in U-Boot. See doc/uImage/signature for more information. in U-Boot. See doc/uImage.FIT/signature.txt for more information.
The signing part is build into mkimage regardless of this The signing part is build into mkimage regardless of this
option. option.

2
arch/arm/cpu/arm1136/config.mk
View File

@ -14,6 +14,6 @@ ifdef CONFIG_SPL_BUILD
ALL-y += $(OBJTREE)/SPL ALL-y += $(OBJTREE)/SPL
endif endif
else else
ALL-y += $(obj)u-boot.imx ALL-y += u-boot.imx
endif endif
endif endif

2
arch/arm/cpu/arm926ejs/config.mk
View File

@ -13,6 +13,6 @@ ifdef CONFIG_SPL_BUILD
ALL-y += $(OBJTREE)/SPL ALL-y += $(OBJTREE)/SPL
endif endif
else else
ALL-y += $(obj)u-boot.imx ALL-y += u-boot.imx
endif endif
endif endif

2
arch/arm/cpu/arm926ejs/davinci/config.mk
View File

@ -4,5 +4,5 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
ifndef CONFIG_SPL_BUILD ifndef CONFIG_SPL_BUILD
ALL-$(CONFIG_SPL_FRAMEWORK) += $(obj)u-boot.ais ALL-$(CONFIG_SPL_FRAMEWORK) += u-boot.ais
endif endif

3
arch/arm/cpu/arm926ejs/omap/Makefile
View File

@ -5,5 +5,6 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
obj-y = timer.o cpuinfo.o obj-y = timer.o
obj-$(CONFIG_DISPLAY_CPUINFO) += cpuinfo.o
obj-y += reset.o obj-y += reset.o

4
arch/arm/cpu/arm926ejs/omap/cpuinfo.c
View File

@ -13,7 +13,7 @@
#include <command.h> #include <command.h>
#include <linux/compiler.h> #include <linux/compiler.h>
#if defined(CONFIG_DISPLAY_CPUINFO) && defined(CONFIG_OMAP) #if defined(CONFIG_OMAP)
#define omap_readw(x) *(volatile unsigned short *)(x) #define omap_readw(x) *(volatile unsigned short *)(x)
#define omap_readl(x) *(volatile unsigned long *)(x) #define omap_readl(x) *(volatile unsigned long *)(x)
@ -239,4 +239,4 @@ int print_cpuinfo (void)
return 0; return 0;
} }
#endif /* #if defined(CONFIG_DISPLAY_CPUINFO) && defined(CONFIG_OMAP) */ #endif /* #if defined(CONFIG_OMAP) */

2
arch/arm/cpu/armv7/am33xx/config.mk
View File

@ -7,5 +7,5 @@ ifdef CONFIG_SPL_BUILD
ALL-y += $(OBJTREE)/MLO ALL-y += $(OBJTREE)/MLO
ALL-$(CONFIG_SPL_SPI_SUPPORT) += $(OBJTREE)/MLO.byteswap ALL-$(CONFIG_SPL_SPI_SUPPORT) += $(OBJTREE)/MLO.byteswap
else else
ALL-y += $(obj)u-boot.img ALL-y += u-boot.img
endif endif

2
arch/arm/cpu/armv7/config.mk
View File

@ -20,6 +20,6 @@ ifdef CONFIG_SPL_BUILD
ALL-y += $(OBJTREE)/SPL ALL-y += $(OBJTREE)/SPL
endif endif
else else
ALL-y += $(obj)u-boot.imx ALL-y += u-boot.imx
endif endif
endif endif

3
arch/arm/cpu/armv7/omap-common/hwinit-common.c
View File

@ -248,6 +248,7 @@ u32 get_device_type(void)
(DEVICE_TYPE_MASK)) >> DEVICE_TYPE_SHIFT; (DEVICE_TYPE_MASK)) >> DEVICE_TYPE_SHIFT;
} }
#if defined(CONFIG_DISPLAY_CPUINFO)
/* /*
* Print CPU information * Print CPU information
*/ */
@ -258,6 +259,8 @@ int print_cpuinfo(void)
return 0; return 0;
} }
#endif
#ifndef CONFIG_SYS_DCACHE_OFF #ifndef CONFIG_SYS_DCACHE_OFF
void enable_caches(void) void enable_caches(void)
{ {

3
arch/arm/cpu/armv7/omap-common/sata.c
View File

@ -12,6 +12,7 @@
#include <scsi.h> #include <scsi.h>
#include <asm/arch/clock.h> #include <asm/arch/clock.h>
#include <asm/arch/sata.h> #include <asm/arch/sata.h>
#include <sata.h>
#include <asm/io.h> #include <asm/io.h>
#include "pipe3-phy.h" #include "pipe3-phy.h"
@ -31,7 +32,7 @@ struct omap_pipe3 sata_phy = {
.dpll_map = dpll_map_sata, .dpll_map = dpll_map_sata,
}; };
int omap_sata_init(void) int init_sata(int dev)
{ {
int ret; int ret;
u32 val; u32 val;

2
arch/arm/cpu/armv7/omap3/config.mk
View File

@ -11,5 +11,5 @@
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
ALL-y += $(OBJTREE)/MLO ALL-y += $(OBJTREE)/MLO
else else
ALL-y += $(obj)u-boot.img ALL-y += u-boot.img
endif endif

2
arch/arm/cpu/armv7/omap4/config.mk
View File

@ -11,5 +11,5 @@
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
ALL-y += $(OBJTREE)/MLO ALL-y += $(OBJTREE)/MLO
else else
ALL-y += $(obj)u-boot.img ALL-y += u-boot.img
endif endif

2
arch/arm/cpu/armv7/omap5/config.mk
View File

@ -9,5 +9,5 @@
ifdef CONFIG_SPL_BUILD ifdef CONFIG_SPL_BUILD
ALL-y += $(OBJTREE)/MLO ALL-y += $(OBJTREE)/MLO
else else
ALL-y += $(obj)u-boot.img ALL-y += u-boot.img
endif endif

2
arch/arm/cpu/armv7/socfpga/config.mk
View File

@ -4,5 +4,5 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
ifndef CONFIG_SPL_BUILD ifndef CONFIG_SPL_BUILD
ALL-y += $(obj)u-boot.img ALL-y += u-boot.img
endif endif

3
arch/arm/cpu/armv7/tegra114/Makefile
View File

@ -17,4 +17,5 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
obj- := # necessary to create built-in.o
obj- := __dummy__.o

3
arch/arm/cpu/armv7/tegra124/Makefile
View File

@ -4,3 +4,6 @@
# #
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# necessary to create built-in.o
obj- := __dummy__.o

3
arch/arm/cpu/armv7/tegra30/Makefile
View File

@ -17,4 +17,5 @@
# along with this program. If not, see <http://www.gnu.org/licenses/>. # along with this program. If not, see <http://www.gnu.org/licenses/>.
# #
obj- := # necessary to create built-in.o
obj- := __dummy__.o

3
arch/arm/cpu/tegra-common/Makefile
View File

@ -8,4 +8,5 @@
# #
obj-y += lowlevel_init.o obj-y += lowlevel_init.o
obj-y += ap.o board.o sys_info.o clock.o cache.o obj-y += ap.o board.o clock.o cache.o
obj-$(CONFIG_DISPLAY_CPUINFO) += sys_info.o

2
arch/arm/cpu/tegra-common/sys_info.c
View File

@ -8,7 +8,6 @@
#include <common.h> #include <common.h>
#include <linux/ctype.h> #include <linux/ctype.h>
#ifdef CONFIG_DISPLAY_CPUINFO
void upstring(char *s) void upstring(char *s)
{ {
while (*s) { while (*s) {
@ -30,4 +29,3 @@ int print_cpuinfo(void)
/* TBD: Add printf of major/minor rev info, stepping, etc. */ /* TBD: Add printf of major/minor rev info, stepping, etc. */
return 0; return 0;
} }
#endif /* CONFIG_DISPLAY_CPUINFO */

1
arch/arm/dts/.gitignore vendored 100644
View File

@ -0,0 +1 @@
*.dtb

37
arch/arm/dts/Makefile 100644
View File

@ -0,0 +1,37 @@
dtb-$(CONFIG_EXYNOS5) += exynos5250-arndale.dtb \
exynos5250-snow.dtb \
exynos5250-smdk5250.dtb \
exynos5420-smdk5420.dtb
dtb-$(CONFIG_TEGRA) += tegra20-harmony.dtb \
tegra20-medcom-wide.dtb \
tegra20-paz00.dtb \
tegra20-plutux.dtb \
tegra20-seaboard.dtb \
tegra20-tec.dtb \
tegra20-trimslice.dtb \
tegra20-ventana.dtb \
tegra20-whistler.dtb \
tegra20-colibri_t20_iris.dtb \
tegra30-beaver.dtb \
tegra30-cardhu.dtb \
tegra30-tec-ng.dtb \
tegra114-dalmore.dtb
dtb-$(CONFIG_ZYNQ) += zynq-zc702.dtb \
zynq-zc706.dtb \
zynq-zed.dtb \
zynq-microzed.dtb \
zynq-zc770-xm010.dtb \
zynq-zc770-xm012.dtb \
zynq-zc770-xm013.dtb
targets += $(dtb-y)
DTC_FLAGS += -R 4 -p 0x1000
PHONY += dtbs
dtbs: $(addprefix $(obj)/, $(dtb-y))
@:
clean-files := *.dtb

0
board/samsung/dts/exynos5250-arndale.dts → arch/arm/dts/exynos5250-arndale.dts
View File

0
board/samsung/dts/exynos5250-smdk5250.dts → arch/arm/dts/exynos5250-smdk5250.dts
View File

0
board/samsung/dts/exynos5250-snow.dts → arch/arm/dts/exynos5250-snow.dts
View File

0
board/samsung/dts/exynos5420-smdk5420.dts → arch/arm/dts/exynos5420-smdk5420.dts
View File

0
board/nvidia/dts/tegra114-dalmore.dts → arch/arm/dts/tegra114-dalmore.dts
View File

0
board/toradex/dts/tegra20-colibri_t20_iris.dts → arch/arm/dts/tegra20-colibri_t20_iris.dts
View File

0
board/nvidia/dts/tegra20-harmony.dts → arch/arm/dts/tegra20-harmony.dts
View File

0
board/avionic-design/dts/tegra20-medcom-wide.dts → arch/arm/dts/tegra20-medcom-wide.dts
View File

0
board/compal/dts/tegra20-paz00.dts → arch/arm/dts/tegra20-paz00.dts
View File

0
board/avionic-design/dts/tegra20-plutux.dts → arch/arm/dts/tegra20-plutux.dts
View File

0
board/nvidia/dts/tegra20-seaboard.dts → arch/arm/dts/tegra20-seaboard.dts
View File

0
board/avionic-design/dts/tegra20-tamonten.dtsi → arch/arm/dts/tegra20-tamonten.dtsi
View File

0
board/avionic-design/dts/tegra20-tec.dts → arch/arm/dts/tegra20-tec.dts
View File

0
board/compulab/dts/tegra20-trimslice.dts → arch/arm/dts/tegra20-trimslice.dts
View File

0
board/nvidia/dts/tegra20-ventana.dts → arch/arm/dts/tegra20-ventana.dts
View File

0
board/nvidia/dts/tegra20-whistler.dts → arch/arm/dts/tegra20-whistler.dts
View File

0
board/nvidia/dts/tegra30-beaver.dts → arch/arm/dts/tegra30-beaver.dts
View File

0
board/nvidia/dts/tegra30-cardhu.dts → arch/arm/dts/tegra30-cardhu.dts
View File

0
board/avionic-design/dts/tegra30-tamonten.dtsi → arch/arm/dts/tegra30-tamonten.dtsi
View File

0
board/avionic-design/dts/tegra30-tec-ng.dts → arch/arm/dts/tegra30-tec-ng.dts
View File

0
board/xilinx/dts/zynq-microzed.dts → arch/arm/dts/zynq-microzed.dts
View File

0
board/xilinx/dts/zynq-zc702.dts → arch/arm/dts/zynq-zc702.dts
View File

0
board/xilinx/dts/zynq-zc706.dts → arch/arm/dts/zynq-zc706.dts
View File

0
board/xilinx/dts/zynq-zc770-xm010.dts → arch/arm/dts/zynq-zc770-xm010.dts
View File

0
board/xilinx/dts/zynq-zc770-xm012.dts → arch/arm/dts/zynq-zc770-xm012.dts
View File

0
board/xilinx/dts/zynq-zc770-xm013.dts → arch/arm/dts/zynq-zc770-xm013.dts
View File

0
board/xilinx/dts/zynq-zed.dts → arch/arm/dts/zynq-zed.dts
View File

2
arch/arm/imx-common/Makefile
View File

@ -25,7 +25,7 @@ obj-$(CONFIG_CMD_HDMIDETECT) += cmd_hdmidet.o
$(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp: $(OBJTREE)/%.cfgtmp : $(SRCTREE)/% $(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp: $(OBJTREE)/%.cfgtmp : $(SRCTREE)/%
mkdir -p $(dir $@) mkdir -p $(dir $@)
$(CC) -E -x c $< $(CPPFLAGS) -o $@ $(CPP) $(cpp_flags) -x c -o $@ $<
$(OBJTREE)/u-boot.imx: $(OBJTREE)/u-boot.bin $(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp $(OBJTREE)/u-boot.imx: $(OBJTREE)/u-boot.bin $(OBJTREE)/$(patsubst "%",%,$(CONFIG_IMX_CONFIG)).cfgtmp
$(OBJTREE)/tools/mkimage -n $(filter-out %.bin,$^) -T imximage \ $(OBJTREE)/tools/mkimage -n $(filter-out %.bin,$^) -T imximage \

4
arch/arm/include/asm/arch-am33xx/sys_proto.h
View File

@ -17,10 +17,6 @@
u32 get_cpu_rev(void); u32 get_cpu_rev(void);
u32 get_sysboot_value(void); u32 get_sysboot_value(void);
#ifdef CONFIG_DISPLAY_CPUINFO
int print_cpuinfo(void);
#endif
extern struct ctrl_stat *cstat; extern struct ctrl_stat *cstat;
u32 get_device_type(void); u32 get_device_type(void);
void save_omap_boot_params(void); void save_omap_boot_params(void);

9
arch/arm/include/asm/arch-omap5/sata.h
View File

@ -36,13 +36,4 @@
#define TI_SATA_IDLE_SMART_WAKE (0x3 << 2) #define TI_SATA_IDLE_SMART_WAKE (0x3 << 2)
#define TI_SATA_IDLE_SMART (0x2 << 2) #define TI_SATA_IDLE_SMART (0x2 << 2)
#ifdef CONFIG_SCSI_AHCI_PLAT
int omap_sata_init(void);
#else
static inline int omap_sata_init(void)
{
return 0;
}
#endif /* CONFIG_SCSI_AHCI_PLAT */
#endif /* _TI_SATA_H */ #endif /* _TI_SATA_H */

1
arch/arm/include/asm/arch-omap5/spl.h
View File

@ -15,6 +15,7 @@
#define BOOT_DEVICE_MMC1 5 #define BOOT_DEVICE_MMC1 5
#define BOOT_DEVICE_MMC2 6 #define BOOT_DEVICE_MMC2 6
#define BOOT_DEVICE_MMC2_2 7 #define BOOT_DEVICE_MMC2_2 7
#define BOOT_DEVICE_SATA 9
#define BOOT_DEVICE_SPI 10 #define BOOT_DEVICE_SPI 10
#define BOOT_DEVICE_UART 0x43 #define BOOT_DEVICE_UART 0x43

6
arch/arm/lib/board.c
View File

@ -197,8 +197,6 @@ static int arm_pci_init(void)
*/ */
typedef int (init_fnc_t) (void); typedef int (init_fnc_t) (void);
int print_cpuinfo(void);
void __dram_init_banksize(void) void __dram_init_banksize(void)
{ {
gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE; gd->bd->bi_dram[0].start = CONFIG_SYS_SDRAM_BASE;
@ -250,9 +248,7 @@ init_fnc_t *init_sequence[] = {
serial_init, /* serial communications setup */ serial_init, /* serial communications setup */
console_init_f, /* stage 1 init of console */ console_init_f, /* stage 1 init of console */
display_banner, /* say that we are here */ display_banner, /* say that we are here */
#if defined(CONFIG_DISPLAY_CPUINFO)
print_cpuinfo, /* display cpu info (and speed) */ print_cpuinfo, /* display cpu info (and speed) */
#endif
#if defined(CONFIG_DISPLAY_BOARDINFO) #if defined(CONFIG_DISPLAY_BOARDINFO)
checkboard, /* display board info */ checkboard, /* display board info */
#endif #endif
@ -280,7 +276,7 @@ void board_init_f(ulong bootflag)
gd->mon_len = _bss_end_ofs; gd->mon_len = _bss_end_ofs;
#ifdef CONFIG_OF_EMBED #ifdef CONFIG_OF_EMBED
/* Get a pointer to the FDT */ /* Get a pointer to the FDT */
gd->fdt_blob = _binary_dt_dtb_start; gd->fdt_blob = __dtb_db_begin;
#elif defined CONFIG_OF_SEPARATE #elif defined CONFIG_OF_SEPARATE
/* FDT is at end of image */ /* FDT is at end of image */
gd->fdt_blob = (void *)(_end_ofs + _TEXT_BASE); gd->fdt_blob = (void *)(_end_ofs + _TEXT_BASE);

10
arch/blackfin/config.mk
View File

@ -12,7 +12,7 @@ CONFIG_STANDALONE_LOAD_ADDR ?= 0x1000 -m elf32bfin
ifeq ($(CONFIG_BFIN_CPU),) ifeq ($(CONFIG_BFIN_CPU),)
CONFIG_BFIN_CPU := \ CONFIG_BFIN_CPU := \
$(shell awk '$$2 == "CONFIG_BFIN_CPU" { print $$3 }' \ $(shell awk '$$2 == "CONFIG_BFIN_CPU" { print $$3 }' \
$(src)include/configs/$(BOARD).h) $(srctree)/include/configs/$(BOARD).h)
else else
CONFIG_BFIN_CPU := $(strip $(CONFIG_BFIN_CPU:"%"=%)) CONFIG_BFIN_CPU := $(strip $(CONFIG_BFIN_CPU:"%"=%))
endif endif
@ -28,10 +28,10 @@ PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections
PLATFORM_RELFLAGS += -mcpu=$(CONFIG_BFIN_CPU) PLATFORM_RELFLAGS += -mcpu=$(CONFIG_BFIN_CPU)
ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS) ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
ALL-y += $(obj)u-boot.ldr ALL-y += u-boot.ldr
endif endif
ifeq ($(CONFIG_ENV_IS_EMBEDDED_IN_LDR),y) ifeq ($(CONFIG_ENV_IS_EMBEDDED_IN_LDR),y)
CREATE_LDR_ENV = $(obj)tools/envcrc --binary > $(obj)env-ldr.o CREATE_LDR_ENV = tools/envcrc --binary > env-ldr.o
HOSTCFLAGS_NOPED_ADSP := \ HOSTCFLAGS_NOPED_ADSP := \
$(shell $(CPP) -dD - -mcpu=$(CONFIG_BFIN_CPU) </dev/null \ $(shell $(CPP) -dD - -mcpu=$(CONFIG_BFIN_CPU) </dev/null \
| awk '$$2 ~ /ADSP/ { print "-D" $$2 }') | awk '$$2 ~ /ADSP/ { print "-D" $$2 }')
@ -47,10 +47,10 @@ LDR_FLAGS-$(CONFIG_BFIN_BOOTROM_USES_EVT1) += -J
LDR_FLAGS += --bmode $(subst BFIN_BOOT_,,$(CONFIG_BFIN_BOOT_MODE)) LDR_FLAGS += --bmode $(subst BFIN_BOOT_,,$(CONFIG_BFIN_BOOT_MODE))
LDR_FLAGS += --use-vmas LDR_FLAGS += --use-vmas
LDR_FLAGS += --initcode $(obj)$(CPUDIR)/initcode.o LDR_FLAGS += --initcode $(CPUDIR)/initcode.o
ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_UART) ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_UART)
LDR_FLAGS-$(CONFIG_ENV_IS_EMBEDDED_IN_LDR) += \ LDR_FLAGS-$(CONFIG_ENV_IS_EMBEDDED_IN_LDR) += \
--punchit $$(($(CONFIG_ENV_OFFSET))):$$(($(CONFIG_ENV_SIZE))):$(obj)env-ldr.o --punchit $$(($(CONFIG_ENV_OFFSET))):$$(($(CONFIG_ENV_SIZE))):env-ldr.o
endif endif
ifneq (,$(findstring s,$(MAKEFLAGS))) ifneq (,$(findstring s,$(MAKEFLAGS)))
LDR_FLAGS += --quiet LDR_FLAGS += --quiet

10
arch/blackfin/cpu/Makefile
View File

@ -22,12 +22,13 @@ obj-y += reset.o
obj-y += traps.o obj-y += traps.o
extra-y += check_initcode extra-y += check_initcode
clean-files := init.lds
# make sure our initcode (which goes into LDR) does not # make sure our initcode (which goes into LDR) does not
# have relocs or external references # have relocs or external references
$(obj)initcode.o: CFLAGS += -fno-function-sections -fno-data-sections CFLAGS_REMOVE_initcode.o := -ffunction-sections -fdata-sections
READINIT = env LC_ALL=C $(CROSS_COMPILE)readelf -s $< READINIT = env LC_ALL=C $(CROSS_COMPILE)readelf -s $<
$(obj)check_initcode: $(obj)initcode.o $(obj)/check_initcode: $(obj)/initcode.o
ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS) ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
@if $(READINIT) | grep '\<GLOBAL\>.*\<UND\>' ; then \ @if $(READINIT) | grep '\<GLOBAL\>.*\<UND\>' ; then \
echo "$< contains external references!" 1>&2 ; \ echo "$< contains external references!" 1>&2 ; \
@ -35,7 +36,6 @@ ifneq ($(CONFIG_BFIN_BOOT_MODE),BFIN_BOOT_BYPASS)
fi fi
endif endif
$(obj)init.lds: init.lds.S CPPFLAGS_init.lds := -ansi
$(CPP) $(CPPFLAGS) $(LDPPFLAGS) -ansi -D__ASSEMBLY__ -P $^ -o $@ $(obj)/init.elf: $(obj)/init.lds $(obj)/init.o $(obj)/initcode.o
$(obj)init.elf: $(obj)init.lds $(obj)init.o $(obj)initcode.o
$(LD) $(LDFLAGS) -T $^ -o $@ $(LD) $(LDFLAGS) -T $^ -o $@

5
arch/blackfin/lib/Makefile
View File

@ -9,7 +9,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS += -DBFIN_BOARD_NAME='"$(BOARD)"' # Unnecessary.
# Use CONFIG_SYS_BOARD instead of BFIN_BOARD_NAME
# and delete this.
ccflags-y += -DBFIN_BOARD_NAME='"$(BOARD)"'
obj-y += ins.o obj-y += ins.o
obj-y += memcmp.o obj-y += memcmp.o

2
arch/m68k/cpu/mcf5227x/Makefile
View File

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# CFLAGS += -DET_DEBUG # ccflags-y += -DET_DEBUG
extra-y = start.o extra-y = start.o
obj-y = cpu.o speed.o cpu_init.o interrupts.o obj-y = cpu.o speed.o cpu_init.o interrupts.o

2
arch/m68k/cpu/mcf523x/Makefile
View File

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# CFLAGS += -DET_DEBUG # ccflags-y += -DET_DEBUG
extra-y = start.o extra-y = start.o
obj-y = cpu.o speed.o cpu_init.o interrupts.o obj-y = cpu.o speed.o cpu_init.o interrupts.o

2
arch/m68k/cpu/mcf52x2/Makefile
View File

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# CFLAGS += -DET_DEBUG # ccflags-y += -DET_DEBUG
extra-y = start.o extra-y = start.o
obj-y = interrupts.o cpu.o speed.o cpu_init.o obj-y = interrupts.o cpu.o speed.o cpu_init.o

2
arch/m68k/cpu/mcf532x/Makefile
View File

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# CFLAGS += -DET_DEBUG # ccflags-y += -DET_DEBUG
extra-y := start.o extra-y := start.o
obj-y = cpu.o speed.o cpu_init.o interrupts.o obj-y = cpu.o speed.o cpu_init.o interrupts.o

2
arch/m68k/cpu/mcf5445x/Makefile
View File

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# CFLAGS += -DET_DEBUG # ccflags-y += -DET_DEBUG
extra-y = start.o extra-y = start.o
obj-y = cpu.o speed.o cpu_init.o interrupts.o pci.o obj-y = cpu.o speed.o cpu_init.o interrupts.o pci.o

2
arch/m68k/cpu/mcf547x_8x/Makefile
View File

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# CFLAGS += -DET_DEBUG # ccflags-y += -DET_DEBUG
extra-y = start.o extra-y = start.o
obj-y = cpu.o speed.o cpu_init.o pci.o interrupts.o slicetimer.o obj-y = cpu.o speed.o cpu_init.o pci.o interrupts.o slicetimer.o

1
arch/microblaze/dts/.gitignore vendored 100644
View File

@ -0,0 +1 @@
*.dtb

11
arch/microblaze/dts/Makefile 100644
View File

@ -0,0 +1,11 @@
dtb-y += microblaze-generic.dtb
targets += $(dtb-y)
DTC_FLAGS += -R 4 -p 0x1000
PHONY += dtbs
dtbs: $(addprefix $(obj)/, $(dtb-y))
@:
clean-files := *.dtb

0
board/xilinx/dts/microblaze-generic.dts → arch/microblaze/dts/microblaze-generic.dts
View File

2
arch/microblaze/lib/board.c
View File

@ -87,7 +87,7 @@ void board_init_f(ulong not_used)
#ifdef CONFIG_OF_EMBED #ifdef CONFIG_OF_EMBED
/* Get a pointer to the FDT */ /* Get a pointer to the FDT */
gd->fdt_blob = _binary_dt_dtb_start; gd->fdt_blob = __dtb_dt_begin;
#elif defined CONFIG_OF_SEPARATE #elif defined CONFIG_OF_SEPARATE
/* FDT is at end of image */ /* FDT is at end of image */
gd->fdt_blob = (void *)__end; gd->fdt_blob = (void *)__end;

0
arch/microblaze/lib/time.c
View File

2
arch/mips/cpu/mips32/config.mk
View File

@ -21,4 +21,4 @@ else
PLATFORM_LDFLAGS += -m elf32ltsmip PLATFORM_LDFLAGS += -m elf32ltsmip
endif endif
CONFIG_STANDALONE_LOAD_ADDR ?= 0x80200000 -T mips.lds CONFIG_STANDALONE_LOAD_ADDR ?= 0x80200000 -T $(srctree)/$(src)/mips.lds

2
arch/mips/cpu/mips64/config.mk
View File

@ -21,4 +21,4 @@ else
PLATFORM_LDFLAGS += -m elf64ltsmip PLATFORM_LDFLAGS += -m elf64ltsmip
endif endif
CONFIG_STANDALONE_LOAD_ADDR ?= 0xffffffff80200000 -T mips64.lds CONFIG_STANDALONE_LOAD_ADDR ?= 0xffffffff80200000 -T $(srctree)/$(src)/mips64.lds

2
arch/mips/cpu/xburst/config.mk
View File

@ -12,4 +12,4 @@ else
PLATFORM_LDFLAGS += -m elf32ltsmip PLATFORM_LDFLAGS += -m elf32ltsmip
endif endif
CONFIG_STANDALONE_LOAD_ADDR ?= 0x80200000 -T mips.lds CONFIG_STANDALONE_LOAD_ADDR ?= 0x80200000 -T $(srctree)/$(src)/mips.lds

2
arch/nds32/config.mk
View File

@ -10,7 +10,7 @@
CROSS_COMPILE ?= nds32le-linux- CROSS_COMPILE ?= nds32le-linux-
CONFIG_STANDALONE_LOAD_ADDR = 0x300000 -T nds32.lds CONFIG_STANDALONE_LOAD_ADDR = 0x300000 -T $(srctree)/$(src)/nds32.lds
PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -mrelax PLATFORM_RELFLAGS += -fno-strict-aliasing -fno-common -mrelax
PLATFORM_RELFLAGS += -gdwarf-2 PLATFORM_RELFLAGS += -gdwarf-2

3
arch/nds32/cpu/n1213/Makefile
View File

@ -9,4 +9,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# necessary to create built-in.o
obj- := __dummy__.o
extra-y = start.o extra-y = start.o

2
arch/powerpc/cpu/mpc8xx/Makefile
View File

@ -5,7 +5,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
# CFLAGS += -DET_DEBUG # ccflags-y += -DET_DEBUG
extra-y += start.o extra-y += start.o
extra-y += traps.o extra-y += traps.o

4
arch/powerpc/lib/Makefile
View File

@ -54,11 +54,11 @@ ifndef CONFIG_SPL_BUILD
# Workaround for local bus unaligned access problems # Workaround for local bus unaligned access problems
# on MPC512x and MPC5200 # on MPC512x and MPC5200
ifdef CONFIG_MPC512X ifdef CONFIG_MPC512X
$(obj)ppcstring.o: AFLAGS += -Dmemcpy=__memcpy AFLAGS_ppcstring.o += -Dmemcpy=__memcpy
obj-y += memcpy_mpc5200.o obj-y += memcpy_mpc5200.o
endif endif
ifdef CONFIG_MPC5200 ifdef CONFIG_MPC5200
$(obj)ppcstring.o: AFLAGS += -Dmemcpy=__memcpy AFLAGS_ppcstring.o += -Dmemcpy=__memcpy
obj-y += memcpy_mpc5200.o obj-y += memcpy_mpc5200.o
endif endif
endif endif

11
arch/sandbox/cpu/Makefile
View File

@ -10,7 +10,10 @@
obj-y := cpu.o os.o start.o state.o obj-y := cpu.o os.o start.o state.o
# os.c is build in the system environment, so needs standard includes # os.c is build in the system environment, so needs standard includes
$(obj)os.o: CFLAGS := $(filter-out -nostdinc,\ # CFLAGS_REMOVE_os.o cannot be used to drop header include path
$(patsubst -I%,-idirafter%,$(CFLAGS))) quiet_cmd_cc_os.o = CC $(quiet_modtag) $@
$(obj).depend.os: CPPFLAGS := $(filter-out -nostdinc,\ cmd_cc_os.o = $(CC) $(filter-out -nostdinc, \
$(patsubst -I%,-idirafter%,$(CPPFLAGS))) $(patsubst -I%,-idirafter%,$(c_flags))) -c -o $@ $<
$(obj)/os.o: $(src)/os.c FORCE
$(call if_changed_dep,cc_os.o)

3
arch/sparc/config.mk
View File

@ -7,6 +7,7 @@
CROSS_COMPILE ?= sparc-elf- CROSS_COMPILE ?= sparc-elf-
CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000 -L $(gcclibdir) -T sparc.lds CONFIG_STANDALONE_LOAD_ADDR ?= 0x00000000 -L $(gcclibdir) \
-T $(srctree)/$(src)/sparc.lds
PLATFORM_CPPFLAGS += -DCONFIG_SPARC -D__sparc__ PLATFORM_CPPFLAGS += -DCONFIG_SPARC -D__sparc__

1
arch/x86/dts/.gitignore vendored 100644
View File

@ -0,0 +1 @@
*.dtb

12
arch/x86/dts/Makefile 100644
View File

@ -0,0 +1,12 @@
dtb-y += link.dtb \
alex.dtb
targets += $(dtb-y)
DTC_FLAGS += -R 4 -p 0x1000
PHONY += dtbs
dtbs: $(addprefix $(obj)/, $(dtb-y))
@:
clean-files := *.dtb

0
board/chromebook-x86/dts/alex.dts → arch/x86/dts/alex.dts
View File

0
board/chromebook-x86/dts/link.dts → arch/x86/dts/link.dts
View File

2
arch/x86/lib/Makefile
View File

@ -23,5 +23,5 @@ obj-$(CONFIG_CMD_ZBOOT) += zimage.o
LIBGCC := $(notdir $(NORMAL_LIBGCC)) LIBGCC := $(notdir $(NORMAL_LIBGCC))
extra-y := $(LIBGCC) extra-y := $(LIBGCC)
$(obj)$(LIBGCC): $(NORMAL_LIBGCC) $(obj)/$(LIBGCC): $(NORMAL_LIBGCC)
$(OBJCOPY) $< $@ --prefix-symbols=__normal_ $(OBJCOPY) $< $@ --prefix-symbols=__normal_

2
arch/x86/lib/init_helpers.c
View File

@ -92,7 +92,7 @@ int find_fdt(void)
{ {
#ifdef CONFIG_OF_EMBED #ifdef CONFIG_OF_EMBED
/* Get a pointer to the FDT */ /* Get a pointer to the FDT */
gd->fdt_blob = _binary_dt_dtb_start; gd->fdt_blob = __dtb_dt_begin;
#elif defined CONFIG_OF_SEPARATE #elif defined CONFIG_OF_SEPARATE
/* FDT is at end of image */ /* FDT is at end of image */
gd->fdt_blob = (ulong *)&_end; gd->fdt_blob = (ulong *)&_end;

2
board/ait/cam_enc_4xx/config.mk
View File

@ -9,7 +9,7 @@
UBL_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/ublimage.cfg UBL_CONFIG = $(SRCTREE)/board/$(BOARDDIR)/ublimage.cfg
ifndef CONFIG_SPL_BUILD ifndef CONFIG_SPL_BUILD
ALL-y += $(obj)u-boot.ubl ALL-y += u-boot.ubl
else else
# as SPL_TEXT_BASE is not page-aligned, we need for some # as SPL_TEXT_BASE is not page-aligned, we need for some
# linkers the -n flag (Do not page align data), to prevent # linkers the -n flag (Do not page align data), to prevent

2
board/altera/socfpga/socfpga_cyclone5.c
View File

@ -12,6 +12,7 @@
DECLARE_GLOBAL_DATA_PTR; DECLARE_GLOBAL_DATA_PTR;
#if defined(CONFIG_DISPLAY_CPUINFO)
/* /*
* Print CPU information * Print CPU information
*/ */
@ -20,6 +21,7 @@ int print_cpuinfo(void)
puts("CPU : Altera SOCFPGA Platform\n"); puts("CPU : Altera SOCFPGA Platform\n");
return 0; return 0;
} }
#endif
/* /*
* Print Board information * Print Board information

2
board/avionic-design/medcom-wide/Makefile
View File

@ -9,4 +9,4 @@
obj-y := ../common/tamonten.o obj-y := ../common/tamonten.o
include ../../nvidia/common/common.mk include $(srctree)/board/nvidia/common/common.mk

2
board/avionic-design/plutux/Makefile
View File

@ -9,4 +9,4 @@
obj-y := ../common/tamonten.o obj-y := ../common/tamonten.o
include ../../nvidia/common/common.mk include $(srctree)/board/nvidia/common/common.mk

2
board/avionic-design/tec-ng/Makefile
View File

@ -7,4 +7,4 @@
obj-y := ../common/tamonten-ng.o obj-y := ../common/tamonten-ng.o
include ../../nvidia/common/common.mk include $(srctree)/board/nvidia/common/common.mk

2
board/avionic-design/tec/Makefile
View File

@ -9,4 +9,4 @@
obj-y := ../common/tamonten.o obj-y := ../common/tamonten.o
include ../../nvidia/common/common.mk include $(srctree)/board/nvidia/common/common.mk

7
board/bct-brettl2/config.mk
View File

@ -7,6 +7,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif

7
board/bf518f-ezbrd/config.mk
View File

@ -7,6 +7,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif

7
board/bf526-ezbrd/config.mk
View File

@ -7,6 +7,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif

7
board/bf527-ad7160-eval/config.mk
View File

@ -7,6 +7,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif

7
board/bf527-ezkit/config.mk
View File

@ -7,6 +7,7 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif

7
board/bf527-sdp/config.mk
View File

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 6 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 6

7
board/bf533-ezkit/config.mk
View File

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

7
board/bf533-stamp/config.mk
View File

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

7
board/bf537-stamp/config.mk
View File

@ -7,9 +7,10 @@
# SPDX-License-Identifier: GPL-2.0+ # SPDX-License-Identifier: GPL-2.0+
# #
CFLAGS_lib += -O2 # FIX ME
CFLAGS_lib/lzma += -O2 ifneq ($(filter lib lib/lzma lib/zlib, $(obj)),)
CFLAGS_lib/zlib += -O2 ccflags-y := -O2
endif
# Set some default LDR flags based on boot mode. # Set some default LDR flags based on boot mode.
LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8 LDR_FLAGS-BFIN_BOOT_PARA := --bits 16 --dma 8

Some files were not shown because too many files have changed in this diff Show More