diff options
| author | Wolfgang Denk <wd@denx.de> | 2010-07-14 22:07:41 +0200 |
|---|---|---|
| committer | Wolfgang Denk <wd@denx.de> | 2010-07-14 22:07:41 +0200 |
| commit | d6f324d03d7829a1da1dee8b60f91b173a3976f0 (patch) | |
| tree | 854d9d8bb71573483276fe9f3faa48f242bb543f /arch | |
| parent | e1e3cf7c79d97e7c59f90036d6e1e8e9d3abfbbe (diff) | |
| parent | a3c09f66b2b84e98333c317ffb24a95f88ee5a10 (diff) | |
| download | u-boot-imx-d6f324d03d7829a1da1dee8b60f91b173a3976f0.zip u-boot-imx-d6f324d03d7829a1da1dee8b60f91b173a3976f0.tar.gz u-boot-imx-d6f324d03d7829a1da1dee8b60f91b173a3976f0.tar.bz2 | |
Merge branch 'next' of git://git.denx.de/u-boot-nios
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/nios2/config.mk | 3 | ||||
| -rw-r--r-- | arch/nios2/include/asm/gpio.h | 6 | ||||
| -rw-r--r-- | arch/nios2/lib/bootm.c | 21 |
3 files changed, 30 insertions, 0 deletions
diff --git a/arch/nios2/config.mk b/arch/nios2/config.mk index 793cc43..aba96b3 100644 --- a/arch/nios2/config.mk +++ b/arch/nios2/config.mk @@ -30,3 +30,6 @@ PLATFORM_CPPFLAGS += -DCONFIG_NIOS2 -D__NIOS2__ PLATFORM_CPPFLAGS += -G0 LDSCRIPT ?= $(SRCTREE)/$(CPUDIR)/u-boot.lds + +LDFLAGS += --gc-sections +PLATFORM_RELFLAGS += -ffunction-sections -fdata-sections diff --git a/arch/nios2/include/asm/gpio.h b/arch/nios2/include/asm/gpio.h index 76c425e..cff1dd9 100644 --- a/arch/nios2/include/asm/gpio.h +++ b/arch/nios2/include/asm/gpio.h @@ -21,6 +21,11 @@ #ifdef CONFIG_SYS_GPIO_BASE #include <asm/io.h> +static inline int gpio_request(unsigned gpio, const char *label) +{ + return 0; +} + static inline int gpio_direction_input(unsigned gpio) { writel(1, CONFIG_SYS_GPIO_BASE + (gpio << 2)); @@ -43,6 +48,7 @@ static inline void gpio_set_value(unsigned gpio, int value) writel(value ? 3 : 2, CONFIG_SYS_GPIO_BASE + (gpio << 2)); } #else +extern int gpio_request(unsigned gpio, const char *label); extern int gpio_direction_input(unsigned gpio); extern int gpio_direction_output(unsigned gpio, int value); extern int gpio_get_value(unsigned gpio); diff --git a/arch/nios2/lib/bootm.c b/arch/nios2/lib/bootm.c index e4093a8..e25a113 100644 --- a/arch/nios2/lib/bootm.c +++ b/arch/nios2/lib/bootm.c @@ -34,6 +34,18 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima char *commandline = getenv("bootargs"); ulong initrd_start = images->rd_start; ulong initrd_end = images->rd_end; + char *of_flat_tree = NULL; +#if defined(CONFIG_OF_LIBFDT) + ulong of_size = 0; + + /* find flattened device tree */ + if (boot_get_fdt(flag, argc, argv, images, &of_flat_tree, &of_size)) + return 1; +#endif + if (!of_flat_tree) + of_flat_tree = (char *)simple_strtoul(argv[3], NULL, 16); + if (of_flat_tree) + initrd_end = (ulong)of_flat_tree; if ((flag != 0) && (flag != BOOTM_STATE_OS_GO)) return 1; @@ -45,6 +57,15 @@ int do_bootm_linux(int flag, int argc, char * const argv[], bootm_headers_t *ima debug("bootargs=%s @ 0x%lx\n", commandline, (ulong)&commandline); debug("initrd=0x%lx-0x%lx\n", (ulong)initrd_start, (ulong)initrd_end); + /* kernel parameters passing + * r4 : NIOS magic + * r5 : initrd start + * r6 : initrd end or fdt + * r7 : kernel command line + * fdt is passed to kernel via r6, the same as initrd_end. fdt will be + * verified with fdt magic. when both initrd and fdt are used at the + * same time, fdt must follow immediately after initrd. + */ kernel(NIOS_MAGIC, initrd_start, initrd_end, commandline); /* does not return */ |