diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2020-02-18 08:36:44 +0100 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2020-02-18 08:36:44 +0100 |
| commit | d6787a36a64aeaff019bfb61b40f247f04c5ade8 (patch) | |
| tree | 8f4fd0981b811d925420b5ffb7c8bf12fd730939 /arch | |
| parent | 0a54a21f182751a0f256119d8b048d8d169ed395 (diff) | |
| parent | f246b4079c746f80e29b07252c546d37a359105f (diff) | |
| download | barebox-d6787a36a64aeaff019bfb61b40f247f04c5ade8.tar.gz barebox-d6787a36a64aeaff019bfb61b40f247f04c5ade8.tar.xz | |
Merge branch 'for-next/misc'
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/Makefile | 7 | ||||
| -rw-r--r-- | arch/arm/boards/stm32mp157c-dk2/board.c | 2 | ||||
| -rw-r--r-- | arch/mips/Makefile | 1 | ||||
| -rw-r--r-- | arch/sandbox/mach-sandbox/include/mach/hostfile.h | 2 | ||||
| -rw-r--r-- | arch/sandbox/os/common.c | 2 |
5 files changed, 12 insertions, 2 deletions
diff --git a/arch/arm/Makefile b/arch/arm/Makefile index 740b0790e7..29fd8e276c 100644 --- a/arch/arm/Makefile +++ b/arch/arm/Makefile @@ -140,6 +140,7 @@ CPPFLAGS += -DTEXT_BASE=$(TEXT_BASE) # Add cleanup flags CPPFLAGS += -fdata-sections -ffunction-sections LDFLAGS_barebox += --gc-sections +LDFLAGS_pbl += --gc-sections # early code often runs at addresses we are not linked at CPPFLAGS += -fPIE @@ -150,6 +151,12 @@ else LDFLAGS_barebox += -static endif +ifdef CONFIG_PBL_RELOCATABLE +LDFLAGS_pbl += -pie +else +LDFLAGS_pbl += -static +endif + KBUILD_BINARY := barebox.bin barebox.s5p: $(KBUILD_BINARY) diff --git a/arch/arm/boards/stm32mp157c-dk2/board.c b/arch/arm/boards/stm32mp157c-dk2/board.c index 9cd5b4ee1f..6da99d9353 100644 --- a/arch/arm/boards/stm32mp157c-dk2/board.c +++ b/arch/arm/boards/stm32mp157c-dk2/board.c @@ -14,6 +14,8 @@ static int dk2_postcore_init(void) stm32mp_bbu_mmc_register_handler("sd", "/dev/mmc0.ssbl", BBU_HANDLER_FLAG_DEFAULT); + barebox_set_model("STM32MP157C-DK2"); + return 0; } postcore_initcall(dk2_postcore_init); diff --git a/arch/mips/Makefile b/arch/mips/Makefile index 72b77adc4c..486dfd8253 100644 --- a/arch/mips/Makefile +++ b/arch/mips/Makefile @@ -44,6 +44,7 @@ endif LDFLAGS += $(ldflags-y) -m $(ld-emul) LDFLAGS_barebox += $(ldflags-y) +LDFLAGS_pbl += $(ldflags-y) # # CPU-dependent compiler/assembler options for optimization. diff --git a/arch/sandbox/mach-sandbox/include/mach/hostfile.h b/arch/sandbox/mach-sandbox/include/mach/hostfile.h index 627fe28e76..54f690be5f 100644 --- a/arch/sandbox/mach-sandbox/include/mach/hostfile.h +++ b/arch/sandbox/mach-sandbox/include/mach/hostfile.h @@ -3,7 +3,7 @@ struct hf_info { int fd; - unsigned long base; + unsigned long long base; size_t size; const char *devname; const char *filename; diff --git a/arch/sandbox/os/common.c b/arch/sandbox/os/common.c index 3ad12b4a30..3f9cc70770 100644 --- a/arch/sandbox/os/common.c +++ b/arch/sandbox/os/common.c @@ -112,7 +112,7 @@ uint64_t linux_get_time(void) clock_gettime(CLOCK_MONOTONIC, &ts); - now = ts.tv_sec * 1000 * 1000 * 1000 + ts.tv_nsec; + now = ts.tv_sec * 1000ULL * 1000 * 1000 + ts.tv_nsec; return now; } |