* [PATCH 02/12] kbuild: add pre-bootloader (pbl) target
2012-07-27 18:32 ` [PATCH 01/12] kbuild: Init all relevant variables used in kbuild files so Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-27 18:33 ` Jean-Christophe PLAGNIOL-VILLARD
2012-07-27 18:33 ` [PATCH 03/12] Add pre-bootloader (pbl) image support Jean-Christophe PLAGNIOL-VILLARD
` (9 subsequent siblings)
10 siblings, 0 replies; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-27 18:33 UTC (permalink / raw)
To: barebox
This will allow to link compiled object to the built-in-pbl.o across the source
tree that will be finally link to the pbl.
Now we compile the source %.c in pbl-%.o and provide -D__PBL__
so we can known in the source when it's compile for barebox or the pbl.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
Makefile | 5 ++++-
scripts/Makefile.build | 48 +++++++++++++++++++++++++++++++++++++++++++++---
scripts/Makefile.lib | 14 ++++++++++++++
3 files changed, 63 insertions(+), 4 deletions(-)
diff --git a/Makefile b/Makefile
index ac5eaaf..168381d 100644
--- a/Makefile
+++ b/Makefile
@@ -481,6 +481,7 @@ barebox-alldirs := $(sort $(barebox-dirs) $(patsubst %/,%,$(filter %/, \
$(core-n) $(core-) $(drivers-n) $(drivers-) \
$(net-n) $(net-) $(libs-n) $(libs-))))
+pbl-common-y := $(patsubst %/, %/built-in-pbl.o, $(common-y))
common-y := $(patsubst %/, %/built-in.o, $(common-y))
# Build barebox
@@ -510,6 +511,8 @@ common-y := $(patsubst %/, %/built-in.o, $(common-y))
# System.map is generated to document addresses of all kernel symbols
barebox-common := $(common-y)
+barebox-pbl-common := $(pbl-common-y)
+export barebox-pbl-common
barebox-all := $(barebox-common)
barebox-lds := $(lds-y)
@@ -714,7 +717,7 @@ barebox.srec: barebox
# The actual objects are generated when descending,
# make sure no implicit rule kicks in
-$(sort $(barebox-head) $(barebox-common) ) $(barebox-lds): $(barebox-dirs) ;
+$(sort $(barebox-head) $(barebox-common) ) $(barebox-lds) $(barebox-pbl-common): $(barebox-dirs) ;
# Handle descending into subdirectories listed in $(barebox-dirs)
# Preset locale variables to speed up the build process. Limit locale
diff --git a/scripts/Makefile.build b/scripts/Makefile.build
index 1a82c44..e5b7779 100644
--- a/scripts/Makefile.build
+++ b/scripts/Makefile.build
@@ -14,6 +14,7 @@ obj-y :=
obj-m :=
lib-y :=
lib-m :=
+pbl-y :=
always :=
targets :=
subdir-y :=
@@ -97,13 +98,19 @@ ifneq ($(strip $(lib-y) $(lib-m) $(lib-n) $(lib-)),)
lib-target := $(obj)/lib.a
endif
-ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(lib-target)),)
+ifneq ($(strip $(obj-y) $(obj-m) $(obj-n) $(obj-) $(lib-target) $(pbl-y)),)
builtin-target := $(obj)/built-in.o
endif
+ifeq ($(CONFIG_PBL_IMAGE), y)
+ifneq ($(strip $(pbl-y) $(builtin-target)),)
+pbl-target := $(obj)/built-in-pbl.o
+endif
+endif
+
# We keep a list of all modules in $(MODVERDIR)
-__build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(extra-y)) \
+__build: $(if $(KBUILD_BUILTIN),$(builtin-target) $(lib-target) $(pbl-target) $(extra-y)) \
$(if $(KBUILD_MODULES),$(obj-m)) \
$(subdir-ym) $(always)
@:
@@ -177,9 +184,11 @@ cmd_cc_symtypes_c = \
# (See cmd_cc_o_c + relevant part of rule_cc_o_c)
quiet_cmd_cc_o_c = CC $(quiet_modtag) $@
+quiet_cmd_pbl_cc_o_c = PBLCC $@
ifndef CONFIG_MODVERSIONS
cmd_cc_o_c = $(CC) $(c_flags) -c -o $@ $<
+cmd_pbl_cc_o_c = $(CC) -D__PBL__ $(c_flags) -c -o $@ $<
else
# When module versioning is enabled the following steps are executed:
@@ -220,8 +229,22 @@ define rule_cc_o_c
mv -f $(dot-target).tmp $(dot-target).cmd
endef
+define rule_pbl_cc_o_c
+ $(call echo-cmd,checksrc) $(cmd_checksrc) \
+ $(call echo-cmd,pbl_cc_o_c) $(cmd_pbl_cc_o_c); \
+ $(cmd_modversions) \
+ scripts/basic/fixdep $(depfile) $@ '$(call make-cmd,pbl_cc__o_c)' > \
+ $(dot-target).tmp; \
+ rm -f $(depfile); \
+ mv -f $(dot-target).tmp $(dot-target).cmd
+endef
+
# Built-in and composite module parts
+pbl-%.o: %.c
+ $(call cmd,force_checksrc)
+ $(call if_changed_rule,pbl_cc_o_c)
+
%.o: %.c FORCE
$(call cmd,force_checksrc)
$(call if_changed_rule,cc_o_c)
@@ -258,10 +281,16 @@ cmd_as_s_S = $(CPP) $(a_flags) -o $@ $<
quiet_cmd_as_o_S = AS $(quiet_modtag) $@
cmd_as_o_S = $(CC) $(a_flags) -c -o $@ $<
+quiet_cmd_pbl_as_o_S = PBLAS $@
+cmd_pbl_as_o_S = $(CC) -D__PBL__ $(a_flags) -c -o $@ $<
+
+pbl-%.o: %.S
+ $(call if_changed_dep,pbl_as_o_S)
+
%.o: %.S FORCE
$(call if_changed_dep,as_o_S)
-targets += $(real-objs-y) $(real-objs-m) $(lib-y)
+targets += $(real-objs-y) $(real-objs-m) $(lib-y) $(pbl-y)
targets += $(extra-y) $(MAKECMDGOALS) $(always)
# Linker scripts preprocessor (.lds.S -> .lds)
@@ -294,6 +323,19 @@ $(builtin-target): $(obj-y) FORCE
targets += $(builtin-target)
endif # builtin-target
+ifdef pbl-target
+quiet_cmd_pbl_link_o_target = PBLLD $@
+# If the list of objects to link is empty, just create an empty built-in-pbl.o
+cmd_pbl_link_o_target = $(if $(strip $(pbl-y)),\
+ $(LD) $(ld_flags) -r -o $@ $(filter $(pbl-y), $^),\
+ rm -f $@; $(AR) rcs $@)
+
+$(pbl-target): $(pbl-y) FORCE
+ $(call if_changed,pbl_link_o_target)
+
+targets += $(pbl-target)
+endif # pbl-target
+
#
# Rule to compile a set of .o files into one .a file
#
diff --git a/scripts/Makefile.lib b/scripts/Makefile.lib
index b842c48..1a5b2b5 100644
--- a/scripts/Makefile.lib
+++ b/scripts/Makefile.lib
@@ -21,6 +21,17 @@ lib-y := $(filter-out $(obj-y), $(sort $(lib-y) $(lib-m)))
# o if we encounter foo/ in $(obj-m), remove it from $(obj-m)
# and add the directory to the list of dirs to descend into: $(subdir-m)
+# for non dirs add pbl- prefix to the target
+# so we recompile the source with custom flags and custom quiet
+__pbl-y := $(notdir $(pbl-y))
+pbl-y := $(patsubst %.o,pbl-%.o,$(__pbl-y))
+# add subdir from $(obj-y) too so we do not need to have the dir define in
+# both $(obj-y) and $(pbl-y)
+__pbl-y := $(filter-out $(pbl-y), $(filter %/, $(obj-y)))
+pbl-y += $(__pbl-y)
+
+pbl-y := $(sort $(patsubst %/, %/built-in-pbl.o, $(pbl-y)))
+
__subdir-y := $(patsubst %/,%,$(filter %/, $(obj-y)))
subdir-y += $(__subdir-y)
__subdir-m := $(patsubst %/,%,$(filter %/, $(obj-m)))
@@ -46,7 +57,9 @@ multi-objs := $(multi-objs-y) $(multi-objs-m)
# $(subdir-obj-y) is the list of objects in $(obj-y) which do not live
# in the local directory
+__subdir-obj-y := $(foreach o,$(pbl-y),$(if $(filter-out $(o),$(notdir $(o))),$(o)))
subdir-obj-y := $(foreach o,$(obj-y),$(if $(filter-out $(o),$(notdir $(o))),$(o)))
+subdir-obj-y += $(__subdir-obj-y)
# $(obj-dirs) is a list of directories that contain object files
obj-dirs := $(dir $(multi-objs) $(subdir-obj-y))
@@ -63,6 +76,7 @@ targets := $(addprefix $(obj)/,$(targets))
obj-y := $(addprefix $(obj)/,$(obj-y))
obj-m := $(addprefix $(obj)/,$(obj-m))
lib-y := $(addprefix $(obj)/,$(lib-y))
+pbl-y := $(addprefix $(obj)/,$(pbl-y))
subdir-obj-y := $(addprefix $(obj)/,$(subdir-obj-y))
real-objs-y := $(addprefix $(obj)/,$(real-objs-y))
real-objs-m := $(addprefix $(obj)/,$(real-objs-m))
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 03/12] Add pre-bootloader (pbl) image support
2012-07-27 18:32 ` [PATCH 01/12] kbuild: Init all relevant variables used in kbuild files so Jean-Christophe PLAGNIOL-VILLARD
2012-07-27 18:33 ` [PATCH 02/12] kbuild: add pre-bootloader (pbl) target Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-27 18:33 ` Jean-Christophe PLAGNIOL-VILLARD
2012-07-27 18:33 ` [PATCH 04/12] pbl: discard unwind symbol if enable in barebox Jean-Christophe PLAGNIOL-VILLARD
` (8 subsequent siblings)
10 siblings, 0 replies; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-27 18:33 UTC (permalink / raw)
To: barebox
This allows for creating a pre-bootloader binary for
- nand boot
- mmc boot
- compressed image
The pbl will be incharge of the lowlevel init if needed.
The barebox will skip it.
Import string functions from linux 3.4 (arch/arm/boot/compressed/string.c) and
implement a dummy panic.
For now on introduce dummy zbarebox* targets and c code that will contain later
the decompressor. This only implemeted on ARM.
This patch is based on Sascha Hauer <s.hauer@pengutronix.de>
Add compressed image support patch
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
Makefile | 6 +-
arch/arm/Kconfig | 1 +
arch/arm/Makefile | 4 +
arch/arm/cpu/Makefile | 1 +
arch/arm/cpu/start.c | 43 ++++++-
arch/arm/lib/Makefile | 4 +
arch/arm/lib/barebox.lds.S | 3 +-
arch/arm/pbl/Makefile | 25 ++++
arch/arm/{lib/barebox.lds.S => pbl/zbarebox.lds.S} | 53 ++------
common/Kconfig | 30 +++++
include/asm-generic/memory_layout.h | 1 +
pbl/Makefile | 5 +
pbl/misc.c | 14 +++
pbl/string.c | 127 ++++++++++++++++++++
14 files changed, 269 insertions(+), 48 deletions(-)
create mode 100644 arch/arm/pbl/Makefile
copy arch/arm/{lib/barebox.lds.S => pbl/zbarebox.lds.S} (60%)
create mode 100644 pbl/Makefile
create mode 100644 pbl/misc.c
create mode 100644 pbl/string.c
diff --git a/Makefile b/Makefile
index 168381d..a102015 100644
--- a/Makefile
+++ b/Makefile
@@ -474,6 +474,8 @@ CFLAGS += $(call cc-option,-Wno-pointer-sign,)
# this default value
export KBUILD_IMAGE ?= barebox
+common-$(CONFIG_PBL_IMAGE) += pbl/
+
barebox-dirs := $(patsubst %/,%,$(filter %/, $(common-y)))
barebox-alldirs := $(sort $(barebox-dirs) $(patsubst %/,%,$(filter %/, \
@@ -520,7 +522,7 @@ barebox-lds := $(lds-y)
# May be overridden by arch/$(ARCH)/Makefile
quiet_cmd_barebox__ ?= LD $@
cmd_barebox__ ?= $(LD) $(LDFLAGS) $(LDFLAGS_barebox) -o $@ \
- -T $(barebox-lds) $(barebox-head) \
+ -T $(barebox-lds) \
--start-group $(barebox-common) --end-group \
$(filter-out $(barebox-lds) $(barebox-common) FORCE ,$^)
@@ -674,7 +676,9 @@ OBJCOPYFLAGS_barebox.bin = -O binary
barebox.bin: barebox FORCE
$(call if_changed,objcopy)
+ifndef CONFIG_PBL_IMAGE
$(call cmd,check_file_size,$(CONFIG_BAREBOX_MAX_IMAGE_SIZE))
+endif
ifdef CONFIG_X86
barebox.S: barebox
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 5acc36f..3d11497 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -4,6 +4,7 @@ config ARM
select HAS_MODULES
select HAVE_CONFIGURABLE_MEMORY_LAYOUT
select HAVE_CONFIGURABLE_TEXT_BASE
+ select HAVE_PBL_IMAGE
default y
config ARM_AMBA
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index bf17203..80ef986 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -194,6 +194,10 @@ ifeq ($(CONFIG_ARCH_DAVINCI),y)
KBUILD_IMAGE := barebox.ubl
endif
+pbl := arch/arm/pbl
+zbarebox.S zbarebox.bin zbarebox: barebox.bin
+ $(Q)$(MAKE) $(build)=$(pbl) $(pbl)/$@
+
all: $(KBUILD_IMAGE)
archprepare: maketools
diff --git a/arch/arm/cpu/Makefile b/arch/arm/cpu/Makefile
index 93a34a9..939e6a7 100644
--- a/arch/arm/cpu/Makefile
+++ b/arch/arm/cpu/Makefile
@@ -15,3 +15,4 @@ obj-$(CONFIG_CPU_32v6) += cache-armv6.o
obj-$(CONFIG_CPU_32v7) += cache-armv7.o
obj-$(CONFIG_CACHE_L2X0) += cache-l2x0.o
+pbl-y += start.o
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index 112403e..49b1d5b 100644
--- a/arch/arm/cpu/start.c
+++ b/arch/arm/cpu/start.c
@@ -28,10 +28,34 @@
#include <asm-generic/memory_layout.h>
#include <asm/sections.h>
+#ifdef CONFIG_PBL_IMAGE
+void __naked __section(.text_head_entry) pbl_start(void)
+{
+ barebox_arm_head();
+}
+
+/*
+ * First function in the pbl image. We get here from
+ * the decompressor
+ */
+void __naked __section(.text_entry) start(void)
+{
+ u32 r;
+
+ /* Setup the stack */
+ r = STACK_BASE + STACK_SIZE - 16;
+ __asm__ __volatile__("mov sp, %0" : : "r"(r));
+ /* clear bss */
+ memset(__bss_start, 0, __bss_stop - __bss_start);
+
+ start_barebox();
+}
+#else
void __naked __section(.text_entry) start(void)
{
barebox_arm_head();
}
+#endif
/*
* The actual reset vector. This code is position independent and usually
@@ -73,6 +97,14 @@ void __naked __bare_init reset(void)
board_init_lowlevel_return();
}
+#ifdef __PBL__
+void barebox_pbl(uint32_t offset)
+{
+}
+#else
+void barebox_pbl(uint32_t offset) {}
+#endif
+
/*
* Board code can jump here by either returning from board_init_lowlevel
* or by calling this function directly.
@@ -105,8 +137,11 @@ void __naked __section(.text_ll_return) board_init_lowlevel_return(void)
/* flush I-cache before jumping to the copied binary */
__asm__ __volatile__("mcr p15, 0, %0, c7, c5, 0" : : "r" (0));
- /* call start_barebox with its absolute address */
- r = (unsigned int)&start_barebox;
- __asm__ __volatile__("mov pc, %0" : : "r"(r));
+ if (IS_ENABLED(CONFIG_PBL_IMAGE)) {
+ barebox_pbl(offset);
+ } else {
+ /* call start_barebox with its absolute address */
+ r = (unsigned int)&start_barebox;
+ __asm__ __volatile__("mov pc, %0" : : "r"(r));
+ }
}
-
diff --git a/arch/arm/lib/Makefile b/arch/arm/lib/Makefile
index 1eaf474..9d0ff7a 100644
--- a/arch/arm/lib/Makefile
+++ b/arch/arm/lib/Makefile
@@ -21,3 +21,7 @@ obj-$(CONFIG_ARM_OPTIMZED_STRING_FUNCTIONS) += memset.o
obj-$(CONFIG_ARM_UNWIND) += unwind.o
obj-$(CONFIG_MODULES) += module.o
extra-y += barebox.lds
+
+pbl-y += lib1funcs.o
+pbl-y += ashldi3.o
+pbl-y += div0.o
diff --git a/arch/arm/lib/barebox.lds.S b/arch/arm/lib/barebox.lds.S
index e0bae70..a69013f 100644
--- a/arch/arm/lib/barebox.lds.S
+++ b/arch/arm/lib/barebox.lds.S
@@ -31,8 +31,9 @@ SECTIONS
{
. = TEXT_BASE;
+#ifndef CONFIG_PBL_IMAGE
PRE_IMAGE
-
+#endif
. = ALIGN(4);
.text :
{
diff --git a/arch/arm/pbl/Makefile b/arch/arm/pbl/Makefile
new file mode 100644
index 0000000..9b364bb
--- /dev/null
+++ b/arch/arm/pbl/Makefile
@@ -0,0 +1,25 @@
+
+OBJCOPYFLAGS_zbarebox.bin = -O binary
+
+targets := zbarebox.lds zbarebox zbarebox.bin zbarebox.S
+
+$(obj)/zbarebox.bin: $(obj)/zbarebox FORCE
+ $(call if_changed,objcopy)
+ $(call cmd,check_file_size,$(CONFIG_BAREBOX_MAX_IMAGE_SIZE))
+ @echo ' Barebox: $@ is ready'
+
+$(obj)/zbarebox.S: $(obj)/zbarebox FORCE
+ $(call if_changed,disasm)
+
+LDFLAGS_zbarebox := -Map zbarebox.map
+zbarebox-common := $(barebox-pbl-common)
+zbarebox-lds := $(obj)/zbarebox.lds
+
+quiet_cmd_zbarebox__ ?= LD $@
+ cmd_zbarebox__ ?= $(LD) $(LDFLAGS) $(LDFLAGS_zbarebox) -o $@ \
+ -T $(zbarebox-lds) \
+ --start-group $(zbarebox-common) --end-group \
+ $(filter-out $(zbarebox-lds) $(zbarebox-common) FORCE ,$^)
+
+$(obj)/zbarebox: $(zbarebox-lds) $(zbarebox-common) FORCE
+ $(call if_changed,zbarebox__)
diff --git a/arch/arm/lib/barebox.lds.S b/arch/arm/pbl/zbarebox.lds.S
similarity index 60%
copy from arch/arm/lib/barebox.lds.S
copy to arch/arm/pbl/zbarebox.lds.S
index e0bae70..1cbcef4 100644
--- a/arch/arm/lib/barebox.lds.S
+++ b/arch/arm/pbl/zbarebox.lds.S
@@ -1,6 +1,5 @@
/*
- * (C) Copyright 2000-2004
- * Wolfgang Denk, DENX Software Engineering, wd@denx.de.
+ * (C) Copyright 2012 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
*
* See file CREDITS for list of people who contributed to this
* project.
@@ -23,13 +22,14 @@
*/
#include <asm-generic/barebox.lds.h>
+#include <asm-generic/memory_layout.h>
OUTPUT_FORMAT("elf32-littlearm", "elf32-littlearm", "elf32-littlearm")
OUTPUT_ARCH(arm)
-ENTRY(start)
+ENTRY(pbl_start)
SECTIONS
{
- . = TEXT_BASE;
+ . = HEAD_TEXT_BASE;
PRE_IMAGE
@@ -38,15 +38,12 @@ SECTIONS
{
_stext = .;
_text = .;
- *(.text_entry*)
+ *(.text_head_entry*)
__ll_return = .;
*(.text_ll_return*)
__bare_init_start = .;
*(.text_bare_init*)
__bare_init_end = .;
- __exceptions_start = .;
- KEEP(*(.text_exceptions*))
- __exceptions_stop = .;
*(.text*)
}
BAREBOX_BARE_INIT_SIZE
@@ -54,48 +51,20 @@ SECTIONS
. = ALIGN(4);
.rodata : { *(.rodata*) }
-#ifdef CONFIG_ARM_UNWIND
- /*
- * Stack unwinding tables
- */
- . = ALIGN(8);
- .ARM.unwind_idx : {
- __start_unwind_idx = .;
- *(.ARM.exidx*)
- __stop_unwind_idx = .;
- }
- .ARM.unwind_tab : {
- __start_unwind_tab = .;
- *(.ARM.extab*)
- __stop_unwind_tab = .;
- }
-#endif
_etext = .; /* End of text and rodata section */
. = ALIGN(4);
- .data : { *(.data*) }
-
- . = .;
- __barebox_cmd_start = .;
- .barebox_cmd : { BAREBOX_CMDS }
- __barebox_cmd_end = .;
-
- __barebox_magicvar_start = .;
- .barebox_magicvar : { BAREBOX_MAGICVARS }
- __barebox_magicvar_end = .;
-
- __barebox_initcalls_start = .;
- .barebox_initcalls : { INITCALLS }
- __barebox_initcalls_end = .;
+ .piggydata : {
+ *(.piggydata)
+ }
- __usymtab_start = .;
- __usymtab : { BAREBOX_SYMS }
- __usymtab_end = .;
+ . = ALIGN(4);
+ .data : { *(.data*) }
. = ALIGN(4);
__bss_start = .;
.bss : { *(.bss*) }
__bss_stop = .;
_end = .;
- _barebox_image_size = __bss_start - TEXT_BASE;
+ _barebox_image_size = __bss_start - HEAD_TEXT_BASE;
}
diff --git a/common/Kconfig b/common/Kconfig
index 7eb5b49..7b5a307 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -101,6 +101,36 @@ config ENVIRONMENT_VARIABLES
menu "memory layout "
+config HAVE_PBL_IMAGE
+ bool
+
+config HAVE_IMAGE_COMPRESSION
+ bool
+
+config PBL_IMAGE
+ bool "Pre-Bootloader image"
+ depends on HAVE_PBL_IMAGE
+
+if PBL_IMAGE
+
+config IMAGE_COMPRESSION
+ bool "Compressed image"
+ depends on HAVE_IMAGE_COMPRESSION
+
+if IMAGE_COMPRESSION
+
+choice
+ prompt "Compression"
+
+config IMAGE_COMPRESSION_LZO
+ bool "lzo"
+
+endchoice
+
+endif
+
+endif
+
config MMU
bool "Enable MMU"
help
diff --git a/include/asm-generic/memory_layout.h b/include/asm-generic/memory_layout.h
index 941cd42..eb1607f 100644
--- a/include/asm-generic/memory_layout.h
+++ b/include/asm-generic/memory_layout.h
@@ -13,6 +13,7 @@
#endif
+#define HEAD_TEXT_BASE MALLOC_BASE
#define MALLOC_SIZE CONFIG_MALLOC_SIZE
#define STACK_SIZE CONFIG_STACK_SIZE
diff --git a/pbl/Makefile b/pbl/Makefile
new file mode 100644
index 0000000..7169c6c
--- /dev/null
+++ b/pbl/Makefile
@@ -0,0 +1,5 @@
+#
+# only unsed by the pbl
+#
+pbl-y += misc.o
+pbl-y += string.o
diff --git a/pbl/misc.c b/pbl/misc.c
new file mode 100644
index 0000000..47e9cea
--- /dev/null
+++ b/pbl/misc.c
@@ -0,0 +1,14 @@
+#include <common.h>
+#include <init.h>
+#include <linux/types.h>
+#include <linux/string.h>
+#include <linux/ctype.h>
+
+void __noreturn panic(const char *fmt, ...)
+{
+ while(1);
+}
+
+void start_barebox(void)
+{
+}
diff --git a/pbl/string.c b/pbl/string.c
new file mode 100644
index 0000000..6787e82
--- /dev/null
+++ b/pbl/string.c
@@ -0,0 +1,127 @@
+/*
+ * arch/arm/boot/compressed/string.c
+ *
+ * Small subset of simple string routines
+ */
+
+#include <linux/types.h>
+
+void *memcpy(void *__dest, __const void *__src, size_t __n)
+{
+ int i = 0;
+ unsigned char *d = (unsigned char *)__dest, *s = (unsigned char *)__src;
+
+ for (i = __n >> 3; i > 0; i--) {
+ *d++ = *s++;
+ *d++ = *s++;
+ *d++ = *s++;
+ *d++ = *s++;
+ *d++ = *s++;
+ *d++ = *s++;
+ *d++ = *s++;
+ *d++ = *s++;
+ }
+
+ if (__n & 1 << 2) {
+ *d++ = *s++;
+ *d++ = *s++;
+ *d++ = *s++;
+ *d++ = *s++;
+ }
+
+ if (__n & 1 << 1) {
+ *d++ = *s++;
+ *d++ = *s++;
+ }
+
+ if (__n & 1)
+ *d++ = *s++;
+
+ return __dest;
+}
+
+void *memmove(void *__dest, __const void *__src, size_t count)
+{
+ unsigned char *d = __dest;
+ const unsigned char *s = __src;
+
+ if (__dest == __src)
+ return __dest;
+
+ if (__dest < __src)
+ return memcpy(__dest, __src, count);
+
+ while (count--)
+ d[count] = s[count];
+ return __dest;
+}
+
+size_t strlen(const char *s)
+{
+ const char *sc = s;
+
+ while (*sc != '\0')
+ sc++;
+ return sc - s;
+}
+
+int memcmp(const void *cs, const void *ct, size_t count)
+{
+ const unsigned char *su1 = cs, *su2 = ct, *end = su1 + count;
+ int res = 0;
+
+ while (su1 < end) {
+ res = *su1++ - *su2++;
+ if (res)
+ break;
+ }
+ return res;
+}
+
+int strcmp(const char *cs, const char *ct)
+{
+ unsigned char c1, c2;
+ int res = 0;
+
+ do {
+ c1 = *cs++;
+ c2 = *ct++;
+ res = c1 - c2;
+ if (res)
+ break;
+ } while (c1);
+ return res;
+}
+
+void *memchr(const void *s, int c, size_t count)
+{
+ const unsigned char *p = s;
+
+ while (count--)
+ if ((unsigned char)c == *p++)
+ return (void *)(p - 1);
+ return NULL;
+}
+
+char *strchr(const char *s, int c)
+{
+ while (*s != (char)c)
+ if (*s++ == '\0')
+ return NULL;
+ return (char *)s;
+}
+
+#undef memset
+
+void *memset(void *s, int c, size_t count)
+{
+ char *xs = s;
+ while (count--)
+ *xs++ = c;
+ return s;
+}
+
+void __memzero(void *s, size_t count)
+{
+ memset(s, 0, count);
+}
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 04/12] pbl: discard unwind symbol if enable in barebox
2012-07-27 18:32 ` [PATCH 01/12] kbuild: Init all relevant variables used in kbuild files so Jean-Christophe PLAGNIOL-VILLARD
2012-07-27 18:33 ` [PATCH 02/12] kbuild: add pre-bootloader (pbl) target Jean-Christophe PLAGNIOL-VILLARD
2012-07-27 18:33 ` [PATCH 03/12] Add pre-bootloader (pbl) image support Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-27 18:33 ` Jean-Christophe PLAGNIOL-VILLARD
2012-07-27 18:33 ` [PATCH 05/12] Add compressed image support Jean-Christophe PLAGNIOL-VILLARD
` (7 subsequent siblings)
10 siblings, 0 replies; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-27 18:33 UTC (permalink / raw)
To: barebox
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/pbl/zbarebox.lds.S | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/arch/arm/pbl/zbarebox.lds.S b/arch/arm/pbl/zbarebox.lds.S
index 1cbcef4..0902067 100644
--- a/arch/arm/pbl/zbarebox.lds.S
+++ b/arch/arm/pbl/zbarebox.lds.S
@@ -46,6 +46,10 @@ SECTIONS
__bare_init_end = .;
*(.text*)
}
+
+ /* Discard unwind if enable in barebox */
+ /DISCARD/ : { *(.ARM.ex*) }
+
BAREBOX_BARE_INIT_SIZE
. = ALIGN(4);
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 05/12] Add compressed image support
2012-07-27 18:32 ` [PATCH 01/12] kbuild: Init all relevant variables used in kbuild files so Jean-Christophe PLAGNIOL-VILLARD
` (2 preceding siblings ...)
2012-07-27 18:33 ` [PATCH 04/12] pbl: discard unwind symbol if enable in barebox Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-27 18:33 ` Jean-Christophe PLAGNIOL-VILLARD
2012-07-27 18:33 ` [PATCH 06/12] only compress default env in uncompressed images Jean-Christophe PLAGNIOL-VILLARD
` (6 subsequent siblings)
10 siblings, 0 replies; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-27 18:33 UTC (permalink / raw)
To: barebox
From: Sascha Hauer <s.hauer@pengutronix.de>
This allows for creating a lzo compressed binary unsing the pbl.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
[From: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>]
re-integrate it in the new pbl target.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/Kconfig | 1 +
arch/arm/Makefile | 4 ++++
arch/arm/cpu/start.c | 59 ++++++++++++++++++++++++++++++++++++++++++++++
arch/arm/pbl/Makefile | 16 +++++++++++--
arch/arm/pbl/piggy.lzo.S | 6 +++++
5 files changed, 84 insertions(+), 2 deletions(-)
create mode 100644 arch/arm/pbl/piggy.lzo.S
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 3d11497..245bec8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -5,6 +5,7 @@ config ARM
select HAVE_CONFIGURABLE_MEMORY_LAYOUT
select HAVE_CONFIGURABLE_TEXT_BASE
select HAVE_PBL_IMAGE
+ select HAVE_IMAGE_COMPRESSION
default y
config ARM_AMBA
diff --git a/arch/arm/Makefile b/arch/arm/Makefile
index 80ef986..8e4bb48 100644
--- a/arch/arm/Makefile
+++ b/arch/arm/Makefile
@@ -194,6 +194,10 @@ ifeq ($(CONFIG_ARCH_DAVINCI),y)
KBUILD_IMAGE := barebox.ubl
endif
+ifdef CONFIG_IMAGE_COMPRESSION
+KBUILD_IMAGE := zbarebox.bin
+endif
+
pbl := arch/arm/pbl
zbarebox.S zbarebox.bin zbarebox: barebox.bin
$(Q)$(MAKE) $(build)=$(pbl) $(pbl)/$@
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index 49b1d5b..a54f5fd 100644
--- a/arch/arm/cpu/start.c
+++ b/arch/arm/cpu/start.c
@@ -98,8 +98,67 @@ void __naked __bare_init reset(void)
}
#ifdef __PBL__
+extern void *input_data;
+extern void *input_data_end;
+
+#define STATIC static
+
+#ifdef CONFIG_IMAGE_COMPRESSION_LZO
+#include "../../../lib/decompress_unlzo.c"
+#endif
+
+void barebox_uncompress(void *compressed_start, unsigned int len)
+{
+ void (*barebox)(void);
+
+ if (IS_ENABLED(CONFIG_THUMB2_BAREBOX))
+ barebox = (void *)(TEXT_BASE + 1);
+ else
+ barebox = (void *)TEXT_BASE;
+
+ decompress((void *)compressed_start,
+ len,
+ NULL, NULL,
+ (void *)TEXT_BASE, NULL, NULL);
+
+ /* flush I-cache before jumping to the uncompressed binary */
+ __asm__ __volatile__("mcr p15, 0, %0, c7, c5, 0" : : "r" (0));
+
+ barebox();
+}
+
void barebox_pbl(uint32_t offset)
{
+ uint32_t compressed_start, compressed_end, len;
+ void (*uncompress)(void *compressed_start, unsigned int len);
+
+ compressed_start = (uint32_t)&input_data - offset;
+ compressed_end = (uint32_t)&input_data_end - offset;
+ len = compressed_end - compressed_start;
+
+ /*
+ * Check if the compressed binary will be overwritten
+ * by the uncompressed binary
+ */
+ if (compressed_start >= TEXT_BASE &&
+ compressed_start < TEXT_BASE + len * 4 ) {
+ /*
+ * copy compressed binary to its link address
+ */
+ memcpy(&input_data, (void *)compressed_start, len);
+ compressed_start = (uint32_t)&input_data;
+ }
+
+ uncompress = barebox_uncompress;
+
+ /* call barebox_uncompress with its absolute address */
+ __asm__ __volatile__(
+ "mov r0, %1\n"
+ "mov r1, %2\n"
+ "mov pc, %0\n"
+ :
+ : "r"(uncompress), "r"(compressed_start), "r"(len)
+ : "r0", "r1");
}
#else
void barebox_pbl(uint32_t offset) {}
diff --git a/arch/arm/pbl/Makefile b/arch/arm/pbl/Makefile
index 9b364bb..4135911 100644
--- a/arch/arm/pbl/Makefile
+++ b/arch/arm/pbl/Makefile
@@ -1,7 +1,14 @@
+suffix_$(CONFIG_IMAGE_COMPRESSION_LZO) = lzo
+
OBJCOPYFLAGS_zbarebox.bin = -O binary
+piggy_o := piggy.$(suffix_y).o
+
+targets := zbarebox.lds zbarebox zbarebox.bin zbarebox.S \
+ $(piggy_o) piggy.$(suffix_y)
-targets := zbarebox.lds zbarebox zbarebox.bin zbarebox.S
+# Make sure files are removed during clean
+extra-y += piggy.gzip piggy.lzo piggy.lzma piggy.xzkern
$(obj)/zbarebox.bin: $(obj)/zbarebox FORCE
$(call if_changed,objcopy)
@@ -12,7 +19,7 @@ $(obj)/zbarebox.S: $(obj)/zbarebox FORCE
$(call if_changed,disasm)
LDFLAGS_zbarebox := -Map zbarebox.map
-zbarebox-common := $(barebox-pbl-common)
+zbarebox-common := $(barebox-pbl-common) $(obj)/$(piggy_o)
zbarebox-lds := $(obj)/zbarebox.lds
quiet_cmd_zbarebox__ ?= LD $@
@@ -23,3 +30,8 @@ quiet_cmd_zbarebox__ ?= LD $@
$(obj)/zbarebox: $(zbarebox-lds) $(zbarebox-common) FORCE
$(call if_changed,zbarebox__)
+
+$(obj)/piggy.$(suffix_y): $(obj)/../../../barebox.bin FORCE
+ $(call if_changed,$(suffix_y))
+
+$(obj)/$(piggy_o): $(obj)/piggy.$(suffix_y) FORCE
diff --git a/arch/arm/pbl/piggy.lzo.S b/arch/arm/pbl/piggy.lzo.S
new file mode 100644
index 0000000..0c0d216
--- /dev/null
+++ b/arch/arm/pbl/piggy.lzo.S
@@ -0,0 +1,6 @@
+ .section .piggydata,#alloc
+ .globl input_data
+input_data:
+ .incbin "arch/arm/compressed/piggy.lzo"
+ .globl input_data_end
+input_data_end:
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 06/12] only compress default env in uncompressed images
2012-07-27 18:32 ` [PATCH 01/12] kbuild: Init all relevant variables used in kbuild files so Jean-Christophe PLAGNIOL-VILLARD
` (3 preceding siblings ...)
2012-07-27 18:33 ` [PATCH 05/12] Add compressed image support Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-27 18:33 ` Jean-Christophe PLAGNIOL-VILLARD
2012-07-27 18:33 ` [PATCH 07/12] ARM: Separate assembler functions into their own section Jean-Christophe PLAGNIOL-VILLARD
` (5 subsequent siblings)
10 siblings, 0 replies; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-27 18:33 UTC (permalink / raw)
To: barebox
From: Sascha Hauer <s.hauer@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
common/Kconfig | 1 +
1 file changed, 1 insertion(+)
diff --git a/common/Kconfig b/common/Kconfig
index 7b5a307..40f0c71 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -511,6 +511,7 @@ config DEFAULT_ENVIRONMENT
config DEFAULT_ENVIRONMENT_COMPRESSED
bool
depends on DEFAULT_ENVIRONMENT
+ depends on !IMAGE_COMPRESSION_LZO
default y if ZLIB
default y if BZLIB
default y if LZO_DECOMPRESS
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 07/12] ARM: Separate assembler functions into their own section
2012-07-27 18:32 ` [PATCH 01/12] kbuild: Init all relevant variables used in kbuild files so Jean-Christophe PLAGNIOL-VILLARD
` (4 preceding siblings ...)
2012-07-27 18:33 ` [PATCH 06/12] only compress default env in uncompressed images Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-27 18:33 ` Jean-Christophe PLAGNIOL-VILLARD
2012-07-30 7:50 ` Sascha Hauer
2012-07-27 18:33 ` [PATCH 08/12] decompress_unlzo: define decompress_unlzo as decompress Jean-Christophe PLAGNIOL-VILLARD
` (4 subsequent siblings)
10 siblings, 1 reply; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-27 18:33 UTC (permalink / raw)
To: barebox
From: Sascha Hauer <s.hauer@pengutronix.de>
To let the linker remove unused functions.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
arch/arm/lib/findbit.S | 9 +++++++++
1 file changed, 9 insertions(+)
diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S
index ef4caff..422455d 100644
--- a/arch/arm/lib/findbit.S
+++ b/arch/arm/lib/findbit.S
@@ -22,6 +22,7 @@
* Purpose : Find a 'zero' bit
* Prototype: int find_first_zero_bit(void *addr, unsigned int maxbit);
*/
+.section .text._find_first_zero_bit_le
ENTRY(_find_first_zero_bit_le)
teq r1, #0
beq 3f
@@ -43,6 +44,7 @@ ENDPROC(_find_first_zero_bit_le)
* Purpose : Find next 'zero' bit
* Prototype: int find_next_zero_bit(void *addr, unsigned int maxbit, int offset)
*/
+.section .text._find_next_zero_bit_le
ENTRY(_find_next_zero_bit_le)
teq r1, #0
beq 3b
@@ -63,6 +65,7 @@ ENDPROC(_find_next_zero_bit_le)
* Purpose : Find a 'one' bit
* Prototype: int find_first_bit(const unsigned long *addr, unsigned int maxbit);
*/
+.section .text._find_first_bit_le
ENTRY(_find_first_bit_le)
teq r1, #0
beq 3f
@@ -84,6 +87,7 @@ ENDPROC(_find_first_bit_le)
* Purpose : Find next 'one' bit
* Prototype: int find_next_zero_bit(void *addr, unsigned int maxbit, int offset)
*/
+.section .text._find_next_bit_le
ENTRY(_find_next_bit_le)
teq r1, #0
beq 3b
@@ -101,6 +105,7 @@ ENDPROC(_find_next_bit_le)
#ifdef __ARMEB__
+.section .text._find_first_zero_bit_be
ENTRY(_find_first_zero_bit_be)
teq r1, #0
beq 3f
@@ -118,6 +123,7 @@ ENTRY(_find_first_zero_bit_be)
mov pc, lr
ENDPROC(_find_first_zero_bit_be)
+.section .text._find_next_zero_bit_be
ENTRY(_find_next_zero_bit_be)
teq r1, #0
beq 3b
@@ -135,6 +141,7 @@ ENTRY(_find_next_zero_bit_be)
b 2b @ loop for next bit
ENDPROC(_find_next_zero_bit_be)
+.section .text._find_first_bit_be
ENTRY(_find_first_bit_be)
teq r1, #0
beq 3f
@@ -152,6 +159,7 @@ ENTRY(_find_first_bit_be)
mov pc, lr
ENDPROC(_find_first_bit_be)
+.section .text._find_next_bit_be
ENTRY(_find_next_bit_be)
teq r1, #0
beq 3b
@@ -173,6 +181,7 @@ ENDPROC(_find_next_bit_be)
/*
* One or more bits in the LSB of r3 are assumed to be set.
*/
+.section .text.L_found
.L_found:
#if __LINUX_ARM_ARCH__ >= 5
rsb r0, r3, #0
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 07/12] ARM: Separate assembler functions into their own section
2012-07-27 18:33 ` [PATCH 07/12] ARM: Separate assembler functions into their own section Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-30 7:50 ` Sascha Hauer
2012-07-30 8:27 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 25+ messages in thread
From: Sascha Hauer @ 2012-07-30 7:50 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox
On Fri, Jul 27, 2012 at 08:33:05PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> From: Sascha Hauer <s.hauer@pengutronix.de>
>
> To let the linker remove unused functions.
This patch contains the hunks I intentionally removed from the second
version of this patch because they are wrong. Please drop this patch.
Sascha
>
> Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
> ---
> arch/arm/lib/findbit.S | 9 +++++++++
> 1 file changed, 9 insertions(+)
>
> diff --git a/arch/arm/lib/findbit.S b/arch/arm/lib/findbit.S
> index ef4caff..422455d 100644
> --- a/arch/arm/lib/findbit.S
> +++ b/arch/arm/lib/findbit.S
> @@ -22,6 +22,7 @@
> * Purpose : Find a 'zero' bit
> * Prototype: int find_first_zero_bit(void *addr, unsigned int maxbit);
> */
> +.section .text._find_first_zero_bit_le
> ENTRY(_find_first_zero_bit_le)
> teq r1, #0
> beq 3f
> @@ -43,6 +44,7 @@ ENDPROC(_find_first_zero_bit_le)
> * Purpose : Find next 'zero' bit
> * Prototype: int find_next_zero_bit(void *addr, unsigned int maxbit, int offset)
> */
> +.section .text._find_next_zero_bit_le
> ENTRY(_find_next_zero_bit_le)
> teq r1, #0
> beq 3b
> @@ -63,6 +65,7 @@ ENDPROC(_find_next_zero_bit_le)
> * Purpose : Find a 'one' bit
> * Prototype: int find_first_bit(const unsigned long *addr, unsigned int maxbit);
> */
> +.section .text._find_first_bit_le
> ENTRY(_find_first_bit_le)
> teq r1, #0
> beq 3f
> @@ -84,6 +87,7 @@ ENDPROC(_find_first_bit_le)
> * Purpose : Find next 'one' bit
> * Prototype: int find_next_zero_bit(void *addr, unsigned int maxbit, int offset)
> */
> +.section .text._find_next_bit_le
> ENTRY(_find_next_bit_le)
> teq r1, #0
> beq 3b
> @@ -101,6 +105,7 @@ ENDPROC(_find_next_bit_le)
>
> #ifdef __ARMEB__
>
> +.section .text._find_first_zero_bit_be
> ENTRY(_find_first_zero_bit_be)
> teq r1, #0
> beq 3f
> @@ -118,6 +123,7 @@ ENTRY(_find_first_zero_bit_be)
> mov pc, lr
> ENDPROC(_find_first_zero_bit_be)
>
> +.section .text._find_next_zero_bit_be
> ENTRY(_find_next_zero_bit_be)
> teq r1, #0
> beq 3b
> @@ -135,6 +141,7 @@ ENTRY(_find_next_zero_bit_be)
> b 2b @ loop for next bit
> ENDPROC(_find_next_zero_bit_be)
>
> +.section .text._find_first_bit_be
> ENTRY(_find_first_bit_be)
> teq r1, #0
> beq 3f
> @@ -152,6 +159,7 @@ ENTRY(_find_first_bit_be)
> mov pc, lr
> ENDPROC(_find_first_bit_be)
>
> +.section .text._find_next_bit_be
> ENTRY(_find_next_bit_be)
> teq r1, #0
> beq 3b
> @@ -173,6 +181,7 @@ ENDPROC(_find_next_bit_be)
> /*
> * One or more bits in the LSB of r3 are assumed to be set.
> */
> +.section .text.L_found
> .L_found:
> #if __LINUX_ARM_ARCH__ >= 5
> rsb r0, r3, #0
> --
> 1.7.10.4
>
>
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 07/12] ARM: Separate assembler functions into their own section
2012-07-30 7:50 ` Sascha Hauer
@ 2012-07-30 8:27 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 0 replies; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-30 8:27 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
On 09:50 Mon 30 Jul , Sascha Hauer wrote:
> On Fri, Jul 27, 2012 at 08:33:05PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > From: Sascha Hauer <s.hauer@pengutronix.de>
> >
> > To let the linker remove unused functions.
>
> This patch contains the hunks I intentionally removed from the second
> version of this patch because they are wrong. Please drop this patch.
ok I drop it
I put decompress_unlzo: define decompress_unlzo as decompress
first
and update the tag
The following changes since commit d8ddfd069f99428244aff34e2ccebe9ed6a6a7a3:
decompress_unlzo: define decompress_unlzo as decompress (2012-07-30 16:23:54 +0800)
are available in the git repository at:
git://git.jcrosoft.org/barebox.git tags/pbl
for you to fetch changes up to 096ff89b5bcc3466f12b7b40b9b0938bb850ca9c:
arm: always enable the garbage collector for pbl (2012-07-30 16:24:26 +0800)
----------------------------------------------------------------
Add pre-bootloader (pbl) image support
This allows for creating a pre-bootloader binary for
- nand boot
- mmc boot
- compressed image
Currently on the compressed image is implemented the boot really on current lowlevel
init support. In a second step this could be move to the pbl c code with generic framework.
The pbl will be incharge of the lowlevel init if needed.
The barebox will skip it.
The decompressor support lzo and gzip and allow to add easly more.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
----------------------------------------------------------------
Jean-Christophe PLAGNIOL-VILLARD (10):
kbuild: Init all relevant variables used in kbuild files so
kbuild: add pre-bootloader (pbl) target
Add pre-bootloader (pbl) image support
pbl: discard unwind symbol if enable in barebox
decompressor: import malloc/free implementation for linux 3.4
ARM: add early malloc support needed by the decompressor
compressed image: add gzip support
at91: add lowlevel init to the pbl
kbuild: allow to have custom cppflags for pbl
arm: always enable the garbage collector for pbl
Sascha Hauer (2):
Add compressed image support
only compress default env in uncompressed images
Makefile | 11 +++++++++--
arch/arm/Kconfig | 2 ++
arch/arm/Makefile | 8 ++++++++
arch/arm/cpu/Makefile | 1 +
arch/arm/cpu/start.c | 113 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++----
arch/arm/lib/Makefile | 4 ++++
arch/arm/lib/barebox.lds.S | 3 ++-
arch/arm/mach-at91/Makefile | 2 ++
arch/arm/pbl/Makefile | 40 +++++++++++++++++++++++++++++++++++++++
arch/arm/pbl/piggy.gzip.S | 6 ++++++
arch/arm/pbl/piggy.lzo.S | 6 ++++++
arch/arm/pbl/zbarebox.lds.S | 74 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
common/Kconfig | 34 +++++++++++++++++++++++++++++++++
include/asm-generic/memory_layout.h | 1 +
include/linux/decompress/mm.h | 68 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
lib/decompress_inflate.c | 1 +
pbl/Makefile | 5 +++++
pbl/misc.c | 14 ++++++++++++++
pbl/string.c | 127 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
scripts/Makefile.build | 75 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-----
scripts/Makefile.lib | 14 ++++++++++++++
21 files changed, 597 insertions(+), 12 deletions(-)
create mode 100644 arch/arm/pbl/Makefile
create mode 100644 arch/arm/pbl/piggy.gzip.S
create mode 100644 arch/arm/pbl/piggy.lzo.S
create mode 100644 arch/arm/pbl/zbarebox.lds.S
create mode 100644 include/linux/decompress/mm.h
create mode 100644 pbl/Makefile
create mode 100644 pbl/misc.c
create mode 100644 pbl/string.c
Best Regards,
J.
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 08/12] decompress_unlzo: define decompress_unlzo as decompress
2012-07-27 18:32 ` [PATCH 01/12] kbuild: Init all relevant variables used in kbuild files so Jean-Christophe PLAGNIOL-VILLARD
` (5 preceding siblings ...)
2012-07-27 18:33 ` [PATCH 07/12] ARM: Separate assembler functions into their own section Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-27 18:33 ` Jean-Christophe PLAGNIOL-VILLARD
2012-07-30 7:56 ` Sascha Hauer
2012-07-27 18:33 ` [PATCH 09/12] decompressor: import malloc/free implementation for linux 3.4 Jean-Christophe PLAGNIOL-VILLARD
` (3 subsequent siblings)
10 siblings, 1 reply; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-27 18:33 UTC (permalink / raw)
To: barebox
so we can use decompress in the decompressor
this will simplify multi decompress support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
lib/decompress_unlzo.c | 1 +
1 file changed, 1 insertion(+)
diff --git a/lib/decompress_unlzo.c b/lib/decompress_unlzo.c
index 0e6a7ad..56abfc6 100644
--- a/lib/decompress_unlzo.c
+++ b/lib/decompress_unlzo.c
@@ -289,3 +289,4 @@ exit_1:
exit:
return ret;
}
+#define decompress decompress_unlzo
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 08/12] decompress_unlzo: define decompress_unlzo as decompress
2012-07-27 18:33 ` [PATCH 08/12] decompress_unlzo: define decompress_unlzo as decompress Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-30 7:56 ` Sascha Hauer
2012-07-30 8:06 ` Sascha Hauer
0 siblings, 1 reply; 25+ messages in thread
From: Sascha Hauer @ 2012-07-30 7:56 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox
On Fri, Jul 27, 2012 at 08:33:06PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> so we can use decompress in the decompressor
> this will simplify multi decompress support
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
> lib/decompress_unlzo.c | 1 +
> 1 file changed, 1 insertion(+)
>
> diff --git a/lib/decompress_unlzo.c b/lib/decompress_unlzo.c
> index 0e6a7ad..56abfc6 100644
> --- a/lib/decompress_unlzo.c
> +++ b/lib/decompress_unlzo.c
> @@ -289,3 +289,4 @@ exit_1:
> exit:
> return ret;
> }
> +#define decompress decompress_unlzo
Shouldn't this be before 5/12?
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 08/12] decompress_unlzo: define decompress_unlzo as decompress
2012-07-30 7:56 ` Sascha Hauer
@ 2012-07-30 8:06 ` Sascha Hauer
0 siblings, 0 replies; 25+ messages in thread
From: Sascha Hauer @ 2012-07-30 8:06 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox
On Mon, Jul 30, 2012 at 09:56:15AM +0200, Sascha Hauer wrote:
> On Fri, Jul 27, 2012 at 08:33:06PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > so we can use decompress in the decompressor
> > this will simplify multi decompress support
> >
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > ---
> > lib/decompress_unlzo.c | 1 +
> > 1 file changed, 1 insertion(+)
> >
> > diff --git a/lib/decompress_unlzo.c b/lib/decompress_unlzo.c
> > index 0e6a7ad..56abfc6 100644
> > --- a/lib/decompress_unlzo.c
> > +++ b/lib/decompress_unlzo.c
> > @@ -289,3 +289,4 @@ exit_1:
> > exit:
> > return ret;
> > }
> > +#define decompress decompress_unlzo
>
> Shouldn't this be before 5/12?
Ok, applied this one into my for-next/compressed-prepare branch, so it
will be in master when we apply this series later.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 09/12] decompressor: import malloc/free implementation for linux 3.4
2012-07-27 18:32 ` [PATCH 01/12] kbuild: Init all relevant variables used in kbuild files so Jean-Christophe PLAGNIOL-VILLARD
` (6 preceding siblings ...)
2012-07-27 18:33 ` [PATCH 08/12] decompress_unlzo: define decompress_unlzo as decompress Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-27 18:33 ` Jean-Christophe PLAGNIOL-VILLARD
2012-07-27 18:33 ` [PATCH 10/12] ARM: add early malloc support needed by the decompressor Jean-Christophe PLAGNIOL-VILLARD
` (2 subsequent siblings)
10 siblings, 0 replies; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-27 18:33 UTC (permalink / raw)
To: barebox
This is need for gunzip support
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
include/linux/decompress/mm.h | 68 +++++++++++++++++++++++++++++++++++++++++
1 file changed, 68 insertions(+)
create mode 100644 include/linux/decompress/mm.h
diff --git a/include/linux/decompress/mm.h b/include/linux/decompress/mm.h
new file mode 100644
index 0000000..0c35411
--- /dev/null
+++ b/include/linux/decompress/mm.h
@@ -0,0 +1,68 @@
+/*
+ * linux/compr_mm.h
+ *
+ * Memory management for pre-boot and ramdisk uncompressors
+ *
+ * Authors: Alain Knaff <alain@knaff.lu>
+ *
+ */
+
+#ifndef DECOMPR_MM_H
+#define DECOMPR_MM_H
+
+#ifdef STATIC
+
+/* Code active when included from pre-boot environment: */
+
+/*
+ * Some architectures want to ensure there is no local data in their
+ * pre-boot environment, so that data can arbitrarily relocated (via
+ * GOT references). This is achieved by defining STATIC_RW_DATA to
+ * be null.
+ */
+#ifndef STATIC_RW_DATA
+#define STATIC_RW_DATA static
+#endif
+
+/* A trivial malloc implementation, adapted from
+ * malloc by Hannu Savolainen 1993 and Matthias Urlichs 1994
+ */
+STATIC_RW_DATA unsigned long malloc_ptr;
+STATIC_RW_DATA int malloc_count;
+
+static void *malloc(int size)
+{
+ void *p;
+
+ if (size < 0)
+ return NULL;
+ if (!malloc_ptr)
+ malloc_ptr = free_mem_ptr;
+
+ malloc_ptr = (malloc_ptr + 3) & ~3; /* Align */
+
+ p = (void *)malloc_ptr;
+ malloc_ptr += size;
+
+ if (free_mem_end_ptr && malloc_ptr >= free_mem_end_ptr)
+ return NULL;
+
+ malloc_count++;
+ return p;
+}
+
+static void free(void *where)
+{
+ malloc_count--;
+ if (!malloc_count)
+ malloc_ptr = free_mem_ptr;
+}
+
+#define large_malloc(a) malloc(a)
+#define large_free(a) free(a)
+
+#define INIT
+
+#endif /* STATIC */
+
+#endif /* DECOMPR_MM_H */
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 10/12] ARM: add early malloc support needed by the decompressor
2012-07-27 18:32 ` [PATCH 01/12] kbuild: Init all relevant variables used in kbuild files so Jean-Christophe PLAGNIOL-VILLARD
` (7 preceding siblings ...)
2012-07-27 18:33 ` [PATCH 09/12] decompressor: import malloc/free implementation for linux 3.4 Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-27 18:33 ` Jean-Christophe PLAGNIOL-VILLARD
2012-07-30 8:02 ` Sascha Hauer
2012-07-27 18:33 ` [PATCH 11/12] compressed image: add gzip support Jean-Christophe PLAGNIOL-VILLARD
2012-07-27 18:33 ` [PATCH 12/12] at91: add lowlevel init to the pbl Jean-Christophe PLAGNIOL-VILLARD
10 siblings, 1 reply; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-27 18:33 UTC (permalink / raw)
To: barebox
This is not needed by lzo but by gunzip, xz and others.
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/cpu/start.c | 7 +++++++
1 file changed, 7 insertions(+)
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index a54f5fd..f500ca8 100644
--- a/arch/arm/cpu/start.c
+++ b/arch/arm/cpu/start.c
@@ -28,6 +28,9 @@
#include <asm-generic/memory_layout.h>
#include <asm/sections.h>
+unsigned long free_mem_ptr;
+unsigned long free_mem_end_ptr;
+
#ifdef CONFIG_PBL_IMAGE
void __naked __section(.text_head_entry) pbl_start(void)
{
@@ -193,6 +196,10 @@ void __naked __section(.text_ll_return) board_init_lowlevel_return(void)
/* clear bss */
memset(__bss_start, 0, __bss_stop - __bss_start);
+ /* set 128 KiB before the STACK_BASE - 16 address for early malloc */
+ free_mem_ptr = STACK_BASE - 0x20000 - 16;
+ free_mem_end_ptr = STACK_BASE - 16;
+
/* flush I-cache before jumping to the copied binary */
__asm__ __volatile__("mcr p15, 0, %0, c7, c5, 0" : : "r" (0));
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 10/12] ARM: add early malloc support needed by the decompressor
2012-07-27 18:33 ` [PATCH 10/12] ARM: add early malloc support needed by the decompressor Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-30 8:02 ` Sascha Hauer
2012-07-30 8:19 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 25+ messages in thread
From: Sascha Hauer @ 2012-07-30 8:02 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox
On Fri, Jul 27, 2012 at 08:33:08PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> This is not needed by lzo but by gunzip, xz and others.
>
> Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> ---
> arch/arm/cpu/start.c | 7 +++++++
> 1 file changed, 7 insertions(+)
>
> diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
> index a54f5fd..f500ca8 100644
> --- a/arch/arm/cpu/start.c
> +++ b/arch/arm/cpu/start.c
> @@ -28,6 +28,9 @@
> #include <asm-generic/memory_layout.h>
> #include <asm/sections.h>
>
> +unsigned long free_mem_ptr;
> +unsigned long free_mem_end_ptr;
> +
> #ifdef CONFIG_PBL_IMAGE
> void __naked __section(.text_head_entry) pbl_start(void)
> {
> @@ -193,6 +196,10 @@ void __naked __section(.text_ll_return) board_init_lowlevel_return(void)
> /* clear bss */
> memset(__bss_start, 0, __bss_stop - __bss_start);
>
> + /* set 128 KiB before the STACK_BASE - 16 address for early malloc */
> + free_mem_ptr = STACK_BASE - 0x20000 - 16;
> + free_mem_end_ptr = STACK_BASE - 16;
> +
This assumes that the malloc area is directly before the stack. How
about using __bss_stop or _end instead?
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 10/12] ARM: add early malloc support needed by the decompressor
2012-07-30 8:02 ` Sascha Hauer
@ 2012-07-30 8:19 ` Jean-Christophe PLAGNIOL-VILLARD
2012-07-30 8:30 ` Sascha Hauer
0 siblings, 1 reply; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-30 8:19 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
On 10:02 Mon 30 Jul , Sascha Hauer wrote:
> On Fri, Jul 27, 2012 at 08:33:08PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > This is not needed by lzo but by gunzip, xz and others.
> >
> > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > ---
> > arch/arm/cpu/start.c | 7 +++++++
> > 1 file changed, 7 insertions(+)
> >
> > diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
> > index a54f5fd..f500ca8 100644
> > --- a/arch/arm/cpu/start.c
> > +++ b/arch/arm/cpu/start.c
> > @@ -28,6 +28,9 @@
> > #include <asm-generic/memory_layout.h>
> > #include <asm/sections.h>
> >
> > +unsigned long free_mem_ptr;
> > +unsigned long free_mem_end_ptr;
> > +
> > #ifdef CONFIG_PBL_IMAGE
> > void __naked __section(.text_head_entry) pbl_start(void)
> > {
> > @@ -193,6 +196,10 @@ void __naked __section(.text_ll_return) board_init_lowlevel_return(void)
> > /* clear bss */
> > memset(__bss_start, 0, __bss_stop - __bss_start);
> >
> > + /* set 128 KiB before the STACK_BASE - 16 address for early malloc */
> > + free_mem_ptr = STACK_BASE - 0x20000 - 16;
> > + free_mem_end_ptr = STACK_BASE - 16;
> > +
>
> This assumes that the malloc area is directly before the stack. How
> about using __bss_stop or _end instead?
it's just for early alloc and __bss_stop no so maybe we can use the same as
Malloc but we already use this for HEAD_TEXT_BASE
Best Regards,
J.
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 10/12] ARM: add early malloc support needed by the decompressor
2012-07-30 8:19 ` Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-30 8:30 ` Sascha Hauer
2012-07-30 8:49 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 25+ messages in thread
From: Sascha Hauer @ 2012-07-30 8:30 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox
On Mon, Jul 30, 2012 at 10:19:42AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 10:02 Mon 30 Jul , Sascha Hauer wrote:
> > On Fri, Jul 27, 2012 at 08:33:08PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > This is not needed by lzo but by gunzip, xz and others.
> > >
> > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > > ---
> > > arch/arm/cpu/start.c | 7 +++++++
> > > 1 file changed, 7 insertions(+)
> > >
> > > diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
> > > index a54f5fd..f500ca8 100644
> > > --- a/arch/arm/cpu/start.c
> > > +++ b/arch/arm/cpu/start.c
> > > @@ -28,6 +28,9 @@
> > > #include <asm-generic/memory_layout.h>
> > > #include <asm/sections.h>
> > >
> > > +unsigned long free_mem_ptr;
> > > +unsigned long free_mem_end_ptr;
> > > +
> > > #ifdef CONFIG_PBL_IMAGE
> > > void __naked __section(.text_head_entry) pbl_start(void)
> > > {
> > > @@ -193,6 +196,10 @@ void __naked __section(.text_ll_return) board_init_lowlevel_return(void)
> > > /* clear bss */
> > > memset(__bss_start, 0, __bss_stop - __bss_start);
> > >
> > > + /* set 128 KiB before the STACK_BASE - 16 address for early malloc */
> > > + free_mem_ptr = STACK_BASE - 0x20000 - 16;
> > > + free_mem_end_ptr = STACK_BASE - 16;
> > > +
> >
> > This assumes that the malloc area is directly before the stack. How
> > about using __bss_stop or _end instead?
>
> it's just for early alloc and __bss_stop no so maybe we can use the same as
> Malloc but we already use this for HEAD_TEXT_BASE
_end is HEAD_TEXT_BASE + the space needed for the compressed
image, so what's wrong with it?
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 10/12] ARM: add early malloc support needed by the decompressor
2012-07-30 8:30 ` Sascha Hauer
@ 2012-07-30 8:49 ` Jean-Christophe PLAGNIOL-VILLARD
2012-07-30 8:59 ` Sascha Hauer
0 siblings, 1 reply; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-30 8:49 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
On 10:30 Mon 30 Jul , Sascha Hauer wrote:
> On Mon, Jul 30, 2012 at 10:19:42AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > On 10:02 Mon 30 Jul , Sascha Hauer wrote:
> > > On Fri, Jul 27, 2012 at 08:33:08PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > > This is not needed by lzo but by gunzip, xz and others.
> > > >
> > > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > > > ---
> > > > arch/arm/cpu/start.c | 7 +++++++
> > > > 1 file changed, 7 insertions(+)
> > > >
> > > > diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
> > > > index a54f5fd..f500ca8 100644
> > > > --- a/arch/arm/cpu/start.c
> > > > +++ b/arch/arm/cpu/start.c
> > > > @@ -28,6 +28,9 @@
> > > > #include <asm-generic/memory_layout.h>
> > > > #include <asm/sections.h>
> > > >
> > > > +unsigned long free_mem_ptr;
> > > > +unsigned long free_mem_end_ptr;
> > > > +
> > > > #ifdef CONFIG_PBL_IMAGE
> > > > void __naked __section(.text_head_entry) pbl_start(void)
> > > > {
> > > > @@ -193,6 +196,10 @@ void __naked __section(.text_ll_return) board_init_lowlevel_return(void)
> > > > /* clear bss */
> > > > memset(__bss_start, 0, __bss_stop - __bss_start);
> > > >
> > > > + /* set 128 KiB before the STACK_BASE - 16 address for early malloc */
> > > > + free_mem_ptr = STACK_BASE - 0x20000 - 16;
> > > > + free_mem_end_ptr = STACK_BASE - 16;
> > > > +
> > >
> > > This assumes that the malloc area is directly before the stack. How
> > > about using __bss_stop or _end instead?
> >
> > it's just for early alloc and __bss_stop no so maybe we can use the same as
> > Malloc but we already use this for HEAD_TEXT_BASE
>
> _end is HEAD_TEXT_BASE + the space needed for the compressed
> image, so what's wrong with it?
the pbl image can be stored in a sram and link to fit there so _end could be
at the end of the sram
so we can not use it.
We need to put the early malloc in the sdram
as example on at91 I plan to load the pbl only without the compressed data
Best Regards,
J.
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 10/12] ARM: add early malloc support needed by the decompressor
2012-07-30 8:49 ` Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-30 8:59 ` Sascha Hauer
2012-07-30 9:04 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 25+ messages in thread
From: Sascha Hauer @ 2012-07-30 8:59 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox
On Mon, Jul 30, 2012 at 10:49:43AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> On 10:30 Mon 30 Jul , Sascha Hauer wrote:
> > On Mon, Jul 30, 2012 at 10:19:42AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > On 10:02 Mon 30 Jul , Sascha Hauer wrote:
> > > > On Fri, Jul 27, 2012 at 08:33:08PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > > > This is not needed by lzo but by gunzip, xz and others.
> > > > >
> > > > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > > > > ---
> > > > > arch/arm/cpu/start.c | 7 +++++++
> > > > > 1 file changed, 7 insertions(+)
> > > > >
> > > > > diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
> > > > > index a54f5fd..f500ca8 100644
> > > > > --- a/arch/arm/cpu/start.c
> > > > > +++ b/arch/arm/cpu/start.c
> > > > > @@ -28,6 +28,9 @@
> > > > > #include <asm-generic/memory_layout.h>
> > > > > #include <asm/sections.h>
> > > > >
> > > > > +unsigned long free_mem_ptr;
> > > > > +unsigned long free_mem_end_ptr;
> > > > > +
> > > > > #ifdef CONFIG_PBL_IMAGE
> > > > > void __naked __section(.text_head_entry) pbl_start(void)
> > > > > {
> > > > > @@ -193,6 +196,10 @@ void __naked __section(.text_ll_return) board_init_lowlevel_return(void)
> > > > > /* clear bss */
> > > > > memset(__bss_start, 0, __bss_stop - __bss_start);
> > > > >
> > > > > + /* set 128 KiB before the STACK_BASE - 16 address for early malloc */
> > > > > + free_mem_ptr = STACK_BASE - 0x20000 - 16;
> > > > > + free_mem_end_ptr = STACK_BASE - 16;
> > > > > +
> > > >
> > > > This assumes that the malloc area is directly before the stack. How
> > > > about using __bss_stop or _end instead?
> > >
> > > it's just for early alloc and __bss_stop no so maybe we can use the same as
> > > Malloc but we already use this for HEAD_TEXT_BASE
> >
> > _end is HEAD_TEXT_BASE + the space needed for the compressed
> > image, so what's wrong with it?
> the pbl image can be stored in a sram and link to fit there so _end could be
> at the end of the sram
>
> so we can not use it.
>
> We need to put the early malloc in the sdram
HEAD_TEXT_BASE is in sdram, because it's the same as MALLOC_BASE, so
_end by definition also is in sdram.
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 10/12] ARM: add early malloc support needed by the decompressor
2012-07-30 8:59 ` Sascha Hauer
@ 2012-07-30 9:04 ` Jean-Christophe PLAGNIOL-VILLARD
2012-07-30 9:20 ` Sascha Hauer
0 siblings, 1 reply; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-30 9:04 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
On 10:59 Mon 30 Jul , Sascha Hauer wrote:
> On Mon, Jul 30, 2012 at 10:49:43AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > On 10:30 Mon 30 Jul , Sascha Hauer wrote:
> > > On Mon, Jul 30, 2012 at 10:19:42AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > > On 10:02 Mon 30 Jul , Sascha Hauer wrote:
> > > > > On Fri, Jul 27, 2012 at 08:33:08PM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > > > > This is not needed by lzo but by gunzip, xz and others.
> > > > > >
> > > > > > Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
> > > > > > ---
> > > > > > arch/arm/cpu/start.c | 7 +++++++
> > > > > > 1 file changed, 7 insertions(+)
> > > > > >
> > > > > > diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
> > > > > > index a54f5fd..f500ca8 100644
> > > > > > --- a/arch/arm/cpu/start.c
> > > > > > +++ b/arch/arm/cpu/start.c
> > > > > > @@ -28,6 +28,9 @@
> > > > > > #include <asm-generic/memory_layout.h>
> > > > > > #include <asm/sections.h>
> > > > > >
> > > > > > +unsigned long free_mem_ptr;
> > > > > > +unsigned long free_mem_end_ptr;
> > > > > > +
> > > > > > #ifdef CONFIG_PBL_IMAGE
> > > > > > void __naked __section(.text_head_entry) pbl_start(void)
> > > > > > {
> > > > > > @@ -193,6 +196,10 @@ void __naked __section(.text_ll_return) board_init_lowlevel_return(void)
> > > > > > /* clear bss */
> > > > > > memset(__bss_start, 0, __bss_stop - __bss_start);
> > > > > >
> > > > > > + /* set 128 KiB before the STACK_BASE - 16 address for early malloc */
> > > > > > + free_mem_ptr = STACK_BASE - 0x20000 - 16;
> > > > > > + free_mem_end_ptr = STACK_BASE - 16;
> > > > > > +
> > > > >
> > > > > This assumes that the malloc area is directly before the stack. How
> > > > > about using __bss_stop or _end instead?
> > > >
> > > > it's just for early alloc and __bss_stop no so maybe we can use the same as
> > > > Malloc but we already use this for HEAD_TEXT_BASE
> > >
> > > _end is HEAD_TEXT_BASE + the space needed for the compressed
> > > image, so what's wrong with it?
> > the pbl image can be stored in a sram and link to fit there so _end could be
> > at the end of the sram
> >
> > so we can not use it.
> >
> > We need to put the early malloc in the sdram
>
> HEAD_TEXT_BASE is in sdram, because it's the same as MALLOC_BASE, so
> _end by definition also is in sdram.
yes but pbl fill the sram fully so in my case I put HEAD_TEXT_BASE is sram not
sdram so no space for the MALLOC and MALLOC_BASE is in sdram
Best Regards,
J.
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* Re: [PATCH 10/12] ARM: add early malloc support needed by the decompressor
2012-07-30 9:04 ` Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-30 9:20 ` Sascha Hauer
2012-07-30 9:30 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 1 reply; 25+ messages in thread
From: Sascha Hauer @ 2012-07-30 9:20 UTC (permalink / raw)
To: Jean-Christophe PLAGNIOL-VILLARD; +Cc: barebox
On Mon, Jul 30, 2012 at 11:04:43AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > > > > > /* clear bss */
> > > > > > > memset(__bss_start, 0, __bss_stop - __bss_start);
> > > > > > >
> > > > > > > + /* set 128 KiB before the STACK_BASE - 16 address for early malloc */
> > > > > > > + free_mem_ptr = STACK_BASE - 0x20000 - 16;
> > > > > > > + free_mem_end_ptr = STACK_BASE - 16;
> > > > > > > +
> > > > > >
> > > > > > This assumes that the malloc area is directly before the stack. How
> > > > > > about using __bss_stop or _end instead?
> > > > >
> > > > > it's just for early alloc and __bss_stop no so maybe we can use the same as
> > > > > Malloc but we already use this for HEAD_TEXT_BASE
> > > >
> > > > _end is HEAD_TEXT_BASE + the space needed for the compressed
> > > > image, so what's wrong with it?
> > > the pbl image can be stored in a sram and link to fit there so _end could be
> > > at the end of the sram
> > >
> > > so we can not use it.
> > >
> > > We need to put the early malloc in the sdram
> >
> > HEAD_TEXT_BASE is in sdram, because it's the same as MALLOC_BASE, so
> > _end by definition also is in sdram.
> yes but pbl fill the sram fully so in my case I put HEAD_TEXT_BASE is sram not
> sdram so no space for the MALLOC and MALLOC_BASE is in sdram
Ok, then the assumption that HEAD_TEXT_BASE is always in sdram is wrong.
We can live with this until you add your at91 support. Nevertheless
MALLOC_BASE always is in sdram, so I suggest to use the last 128k of the
malloc space for early malloc:
free_mem_ptr = MALLOC_BASE + MALLOC_SIZE - SZ_128K
Sascha
--
Pengutronix e.K. | |
Industrial Linux Solutions | http://www.pengutronix.de/ |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0 |
Amtsgericht Hildesheim, HRA 2686 | Fax: +49-5121-206917-5555 |
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread
* Re: [PATCH 10/12] ARM: add early malloc support needed by the decompressor
2012-07-30 9:20 ` Sascha Hauer
@ 2012-07-30 9:30 ` Jean-Christophe PLAGNIOL-VILLARD
0 siblings, 0 replies; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-30 9:30 UTC (permalink / raw)
To: Sascha Hauer; +Cc: barebox
On 11:20 Mon 30 Jul , Sascha Hauer wrote:
> On Mon, Jul 30, 2012 at 11:04:43AM +0200, Jean-Christophe PLAGNIOL-VILLARD wrote:
> > > > > > > > /* clear bss */
> > > > > > > > memset(__bss_start, 0, __bss_stop - __bss_start);
> > > > > > > >
> > > > > > > > + /* set 128 KiB before the STACK_BASE - 16 address for early malloc */
> > > > > > > > + free_mem_ptr = STACK_BASE - 0x20000 - 16;
> > > > > > > > + free_mem_end_ptr = STACK_BASE - 16;
> > > > > > > > +
> > > > > > >
> > > > > > > This assumes that the malloc area is directly before the stack. How
> > > > > > > about using __bss_stop or _end instead?
> > > > > >
> > > > > > it's just for early alloc and __bss_stop no so maybe we can use the same as
> > > > > > Malloc but we already use this for HEAD_TEXT_BASE
> > > > >
> > > > > _end is HEAD_TEXT_BASE + the space needed for the compressed
> > > > > image, so what's wrong with it?
> > > > the pbl image can be stored in a sram and link to fit there so _end could be
> > > > at the end of the sram
> > > >
> > > > so we can not use it.
> > > >
> > > > We need to put the early malloc in the sdram
> > >
> > > HEAD_TEXT_BASE is in sdram, because it's the same as MALLOC_BASE, so
> > > _end by definition also is in sdram.
> > yes but pbl fill the sram fully so in my case I put HEAD_TEXT_BASE is sram not
> > sdram so no space for the MALLOC and MALLOC_BASE is in sdram
>
> Ok, then the assumption that HEAD_TEXT_BASE is always in sdram is wrong.
> We can live with this until you add your at91 support. Nevertheless
> MALLOC_BASE always is in sdram, so I suggest to use the last 128k of the
> malloc space for early malloc:
>
> free_mem_ptr = MALLOC_BASE + MALLOC_SIZE - SZ_128K
ok fine by me
I resend the full patch series
Best Regards,
J.
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread
* [PATCH 11/12] compressed image: add gzip support
2012-07-27 18:32 ` [PATCH 01/12] kbuild: Init all relevant variables used in kbuild files so Jean-Christophe PLAGNIOL-VILLARD
` (8 preceding siblings ...)
2012-07-27 18:33 ` [PATCH 10/12] ARM: add early malloc support needed by the decompressor Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-27 18:33 ` Jean-Christophe PLAGNIOL-VILLARD
2012-07-27 18:33 ` [PATCH 12/12] at91: add lowlevel init to the pbl Jean-Christophe PLAGNIOL-VILLARD
10 siblings, 0 replies; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-27 18:33 UTC (permalink / raw)
To: barebox
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/cpu/start.c | 4 ++++
arch/arm/pbl/Makefile | 1 +
arch/arm/pbl/piggy.gzip.S | 6 ++++++
common/Kconfig | 3 +++
lib/decompress_inflate.c | 1 +
5 files changed, 15 insertions(+)
create mode 100644 arch/arm/pbl/piggy.gzip.S
diff --git a/arch/arm/cpu/start.c b/arch/arm/cpu/start.c
index f500ca8..59b33d0 100644
--- a/arch/arm/cpu/start.c
+++ b/arch/arm/cpu/start.c
@@ -110,6 +110,10 @@ extern void *input_data_end;
#include "../../../lib/decompress_unlzo.c"
#endif
+#ifdef CONFIG_IMAGE_COMPRESSION_GZIP
+#include "../../../../lib/decompress_inflate.c"
+#endif
+
void barebox_uncompress(void *compressed_start, unsigned int len)
{
void (*barebox)(void);
diff --git a/arch/arm/pbl/Makefile b/arch/arm/pbl/Makefile
index 4135911..04fdffb 100644
--- a/arch/arm/pbl/Makefile
+++ b/arch/arm/pbl/Makefile
@@ -1,4 +1,5 @@
+suffix_$(CONFIG_IMAGE_COMPRESSION_GZIP) = gzip
suffix_$(CONFIG_IMAGE_COMPRESSION_LZO) = lzo
OBJCOPYFLAGS_zbarebox.bin = -O binary
diff --git a/arch/arm/pbl/piggy.gzip.S b/arch/arm/pbl/piggy.gzip.S
new file mode 100644
index 0000000..ef3dd77
--- /dev/null
+++ b/arch/arm/pbl/piggy.gzip.S
@@ -0,0 +1,6 @@
+ .section .piggydata,#alloc
+ .globl input_data
+input_data:
+ .incbin "arch/arm/compressed/piggy.gzip"
+ .globl input_data_end
+input_data_end:
diff --git a/common/Kconfig b/common/Kconfig
index 40f0c71..6fee9ae 100644
--- a/common/Kconfig
+++ b/common/Kconfig
@@ -125,6 +125,9 @@ choice
config IMAGE_COMPRESSION_LZO
bool "lzo"
+config IMAGE_COMPRESSION_GZIP
+ bool "gzip"
+
endchoice
endif
diff --git a/lib/decompress_inflate.c b/lib/decompress_inflate.c
index 526d6a1..5c1ebb6 100644
--- a/lib/decompress_inflate.c
+++ b/lib/decompress_inflate.c
@@ -4,6 +4,7 @@
/* prevent inclusion of _LINUX_KERNEL_H in pre-boot environment: lots
* errors about console_printk etc... on ARM */
#define _LINUX_KERNEL_H
+#include <linux/decompress/mm.h>
#include "zlib_inflate/inftrees.c"
#include "zlib_inflate/inffast.c"
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread* [PATCH 12/12] at91: add lowlevel init to the pbl
2012-07-27 18:32 ` [PATCH 01/12] kbuild: Init all relevant variables used in kbuild files so Jean-Christophe PLAGNIOL-VILLARD
` (9 preceding siblings ...)
2012-07-27 18:33 ` [PATCH 11/12] compressed image: add gzip support Jean-Christophe PLAGNIOL-VILLARD
@ 2012-07-27 18:33 ` Jean-Christophe PLAGNIOL-VILLARD
10 siblings, 0 replies; 25+ messages in thread
From: Jean-Christophe PLAGNIOL-VILLARD @ 2012-07-27 18:33 UTC (permalink / raw)
To: barebox
Signed-off-by: Jean-Christophe PLAGNIOL-VILLARD <plagnioj@jcrosoft.com>
---
arch/arm/mach-at91/Makefile | 2 ++
1 file changed, 2 insertions(+)
diff --git a/arch/arm/mach-at91/Makefile b/arch/arm/mach-at91/Makefile
index 491c454..3ade725 100644
--- a/arch/arm/mach-at91/Makefile
+++ b/arch/arm/mach-at91/Makefile
@@ -4,6 +4,8 @@ lowlevel_init-y = at91sam926x_lowlevel_init.o
lowlevel_init-$(CONFIG_ARCH_AT91RM9200) = at91rm9200_lowlevel_init.o
obj-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)
+pbl-$(CONFIG_MACH_DO_LOWLEVEL_INIT) += $(lowlevel_init-y)
+
obj-$(CONFIG_AT91SAM9_RESET) += at91sam9_reset.o
obj-$(CONFIG_AT91SAM9G45_RESET) += at91sam9g45_reset.o
--
1.7.10.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
^ permalink raw reply [flat|nested] 25+ messages in thread