Merge branch 'for-next/misc'
This commit is contained in:
commit
4517b5980f
|
@ -35,6 +35,7 @@ barebox.srec
|
|||
barebox.netx
|
||||
barebox.s5p
|
||||
barebox.ubl
|
||||
barebox.uimage
|
||||
barebox.map
|
||||
System.map
|
||||
Module.symvers
|
||||
|
|
19
Makefile
19
Makefile
|
@ -686,6 +686,22 @@ ifndef CONFIG_PBL_IMAGE
|
|||
$(call cmd,check_file_size,$(CONFIG_BAREBOX_MAX_IMAGE_SIZE))
|
||||
endif
|
||||
|
||||
# By default the uImage load address is 2MB below CONFIG_TEXT_BASE,
|
||||
# leaving space for the compressed PBL image at 1MB below CONFIG_TEXT_BASE.
|
||||
UIMAGE_BASE ?= $(shell printf "0x%08x" $$(($(CONFIG_TEXT_BASE) - 0x200000)))
|
||||
|
||||
# For development provide a target which makes barebox loadable by an
|
||||
# unmodified u-boot
|
||||
quiet_cmd_barebox_mkimage = MKIMAGE $@
|
||||
cmd_barebox_mkimage = $(srctree)/scripts/mkimage -A $(ARCH) -T firmware -C none \
|
||||
-O barebox -a $(UIMAGE_BASE) -e $(UIMAGE_BASE) \
|
||||
-n "barebox $(KERNELRELEASE)" -d $< $@
|
||||
|
||||
# barebox.uimage is build from the raw barebox binary, without any other
|
||||
# headers.
|
||||
barebox.uimage: $(KBUILD_BINARY) FORCE
|
||||
$(call if_changed,barebox_mkimage)
|
||||
|
||||
ifdef CONFIG_X86
|
||||
barebox.S: barebox
|
||||
ifdef CONFIG_X86_HDBOOT
|
||||
|
@ -1015,7 +1031,8 @@ CLEAN_FILES += barebox System.map include/generated/barebox_default_env.h \
|
|||
.tmp_version .tmp_barebox* barebox.bin barebox.map barebox.S \
|
||||
.tmp_kallsyms* barebox_default_env* barebox.ldr \
|
||||
scripts/bareboxenv-target barebox-flash-image \
|
||||
Doxyfile.version barebox.srec barebox.s5p
|
||||
Doxyfile.version barebox.srec barebox.s5p barebox.ubl \
|
||||
barebox.uimage
|
||||
|
||||
# Directories & files removed with 'make mrproper'
|
||||
MRPROPER_DIRS += include/config include2 usr/include
|
||||
|
|
|
@ -37,6 +37,10 @@ int mxc_iomux_v3_setup_pad(iomux_v3_cfg_t pad)
|
|||
u32 pad_ctrl_ofs = (pad & MUX_PAD_CTRL_OFS_MASK) >> MUX_PAD_CTRL_OFS_SHIFT;
|
||||
u32 pad_ctrl = (pad & MUX_PAD_CTRL_MASK) >> MUX_PAD_CTRL_SHIFT;
|
||||
|
||||
debug("%s: mux 0x%08x -> 0x%04x pad: 0x%08x -> 0x%04x sel_inp: 0x%08x -> 0x%04x\n",
|
||||
__func__, mux_mode, mux_ctrl_ofs, pad_ctrl, pad_ctrl_ofs, sel_input,
|
||||
sel_input_ofs);
|
||||
|
||||
if (mux_ctrl_ofs)
|
||||
__raw_writel(mux_mode, base + mux_ctrl_ofs);
|
||||
|
||||
|
|
|
@ -96,6 +96,10 @@ config BANNER
|
|||
bool "display banner"
|
||||
default y
|
||||
|
||||
config MEMINFO
|
||||
bool "display memory info"
|
||||
default y
|
||||
|
||||
config ENVIRONMENT_VARIABLES
|
||||
bool "environment variables support"
|
||||
|
||||
|
|
|
@ -19,6 +19,7 @@ obj-$(CONFIG_MALLOC_TLSF) += tlsf.o
|
|||
obj-$(CONFIG_MALLOC_DUMMY) += dummy_malloc.o
|
||||
obj-y += clock.o
|
||||
obj-$(CONFIG_BANNER) += version.o
|
||||
obj-$(CONFIG_MEMINFO) += meminfo.o
|
||||
obj-$(CONFIG_COMMAND_SUPPORT) += command.o
|
||||
obj-$(CONFIG_CONSOLE_FULL) += console.o
|
||||
obj-$(CONFIG_CONSOLE_SIMPLE) += console_simple.o
|
||||
|
|
|
@ -0,0 +1,23 @@
|
|||
#include <common.h>
|
||||
#include <init.h>
|
||||
#include <memory.h>
|
||||
#include <asm-generic/memory_layout.h>
|
||||
|
||||
static int display_meminfo(void)
|
||||
{
|
||||
ulong mstart = mem_malloc_start();
|
||||
ulong mend = mem_malloc_end();
|
||||
ulong msize = mend - mstart + 1;
|
||||
|
||||
debug("barebox code: 0x%p -> 0x%p\n", _stext, _etext);
|
||||
debug("bss segment: 0x%p -> 0x%p\n", __bss_start, __bss_stop);
|
||||
printf("malloc space: 0x%08lx -> 0x%08lx (size %s)\n",
|
||||
mstart, mend, size_human_readable(msize));
|
||||
#ifdef CONFIG_ARM
|
||||
printf("stack space: 0x%08x -> 0x%08x (size %s)\n",
|
||||
STACK_BASE, STACK_BASE + STACK_SIZE,
|
||||
size_human_readable(STACK_SIZE));
|
||||
#endif
|
||||
return 0;
|
||||
}
|
||||
late_initcall(display_meminfo);
|
|
@ -33,34 +33,15 @@
|
|||
#include <init.h>
|
||||
#include <command.h>
|
||||
#include <malloc.h>
|
||||
#include <memory.h>
|
||||
#include <debug_ll.h>
|
||||
#include <fs.h>
|
||||
#include <linux/stat.h>
|
||||
#include <environment.h>
|
||||
#include <asm-generic/memory_layout.h>
|
||||
#include <asm/sections.h>
|
||||
|
||||
extern initcall_t __barebox_initcalls_start[], __barebox_early_initcalls_end[],
|
||||
__barebox_initcalls_end[];
|
||||
|
||||
static void display_meminfo(void)
|
||||
{
|
||||
ulong mstart = mem_malloc_start();
|
||||
ulong mend = mem_malloc_end();
|
||||
ulong msize = mend - mstart + 1;
|
||||
|
||||
debug("barebox code: 0x%p -> 0x%p\n", _stext, _etext);
|
||||
debug("bss segment: 0x%p -> 0x%p\n", __bss_start, __bss_stop);
|
||||
printf("Malloc space: 0x%08lx -> 0x%08lx (size %s)\n",
|
||||
mstart, mend, size_human_readable(msize));
|
||||
#ifdef CONFIG_ARM
|
||||
printf("Stack space : 0x%08x -> 0x%08x (size %s)\n",
|
||||
STACK_BASE, STACK_BASE + STACK_SIZE,
|
||||
size_human_readable(STACK_SIZE));
|
||||
#endif
|
||||
}
|
||||
|
||||
#ifdef CONFIG_DEFAULT_ENVIRONMENT
|
||||
#include <generated/barebox_default_env.h>
|
||||
|
||||
|
@ -128,8 +109,6 @@ void start_barebox (void)
|
|||
|
||||
debug("initcalls done\n");
|
||||
|
||||
display_meminfo();
|
||||
|
||||
#ifdef CONFIG_ENV_HANDLING
|
||||
if (envfs_load(default_environment_path, "/env")) {
|
||||
#ifdef CONFIG_DEFAULT_ENVIRONMENT
|
||||
|
|
|
@ -150,11 +150,11 @@ static inline void dump_stack(void)
|
|||
#define MEMAREA_SIZE_SPECIFIED 1
|
||||
|
||||
struct memarea_info {
|
||||
struct device_d *device;
|
||||
struct device_d *device;
|
||||
unsigned long start;
|
||||
unsigned long end;
|
||||
unsigned long size;
|
||||
unsigned long flags;
|
||||
unsigned long flags;
|
||||
};
|
||||
|
||||
int parse_area_spec(const char *str, loff_t *start, loff_t *size);
|
||||
|
|
|
@ -1,4 +1,3 @@
|
|||
/* vi: set sw=8 ts=8: */
|
||||
/*
|
||||
* Utility routines.
|
||||
*
|
||||
|
|
|
@ -11,7 +11,11 @@ shift 2
|
|||
tempdir=$(mktemp -d tmp.XXXXXX)
|
||||
|
||||
for i in $*; do
|
||||
cp -r $i/* $tempdir
|
||||
if [ -d $i ]; then
|
||||
cp -r $i/* $tempdir
|
||||
else
|
||||
cp -a $i $tempdir
|
||||
fi
|
||||
done
|
||||
|
||||
find $tempdir -name '.svn' -o -name '*~' | xargs --no-run-if-empty rm -r
|
||||
|
|
Loading…
Reference in New Issue