diff options
| author | Chander Kashyap <chander.kashyap@linaro.org> | 2012-02-05 23:01:48 +0000 | 
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2012-02-12 10:11:30 +0100 | 
| commit | 81e352032ccbf00e756083adc70d418a6ea80b14 (patch) | |
| tree | 6407b97408426da3727004b532b5db3b925b1a7e | |
| parent | 0aee53baccd29a3153ba04403ace4159248d95db (diff) | |
| download | olio-uboot-2014.01-81e352032ccbf00e756083adc70d418a6ea80b14.tar.xz olio-uboot-2014.01-81e352032ccbf00e756083adc70d418a6ea80b14.zip | |
EXYNOS: SMDK5250: Add MMC SPL support
This patch adds support for MMC SPL booting.
Signed-off-by: Chander Kashyap <chander.kashyap@linaro.org>
Signed-off-by: Minkyu Kang <mk7.kang@samsung.com>
| -rw-r--r-- | Makefile | 1 | ||||
| -rw-r--r-- | board/samsung/smdk5250/Makefile | 7 | ||||
| -rw-r--r-- | board/samsung/smdk5250/mmc_boot.c | 58 | ||||
| -rw-r--r-- | include/configs/smdk5250.h | 7 | ||||
| -rw-r--r-- | tools/Makefile | 6 | ||||
| -rw-r--r-- | tools/mkexynosspl.c | 122 | 
6 files changed, 201 insertions, 0 deletions
| @@ -735,6 +735,7 @@ clean:  	       $(obj)tools/gdb/{astest,gdbcont,gdbsend}			  \  	       $(obj)tools/gen_eth_addr    $(obj)tools/img2srec		  \  	       $(obj)tools/mk{env,}image   $(obj)tools/mpc86x_clk	  \ +	       $(obj)tools/mk{smdk5250,}spl				  \  	       $(obj)tools/ncb		   $(obj)tools/ubsha1  	@rm -f $(obj)board/cray/L1/{bootscript.c,bootscript.image}	  \  	       $(obj)board/matrix_vision/*/bootscript.img		  \ diff --git a/board/samsung/smdk5250/Makefile b/board/samsung/smdk5250/Makefile index 80e8be32d..226db1f1f 100644 --- a/board/samsung/smdk5250/Makefile +++ b/board/samsung/smdk5250/Makefile @@ -29,7 +29,14 @@ SOBJS	:= lowlevel_init.o  COBJS	:= clock_init.o  COBJS	+= dmc_init.o  COBJS	+= tzpc_init.o + +ifndef CONFIG_SPL_BUILD  COBJS	+= smdk5250.o +endif + +ifdef CONFIG_SPL_BUILD +COBJS	+= mmc_boot.o +endif  SRCS	:= $(SOBJS:.o=.S) $(COBJS:.o=.c)  OBJS	:= $(addprefix $(obj),$(COBJS) $(SOBJS)) diff --git a/board/samsung/smdk5250/mmc_boot.c b/board/samsung/smdk5250/mmc_boot.c new file mode 100644 index 000000000..449a919d5 --- /dev/null +++ b/board/samsung/smdk5250/mmc_boot.c @@ -0,0 +1,58 @@ +/* + * Copyright (C) 2012 Samsung Electronics + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include<common.h> +#include<config.h> + +/* +* Copy U-boot from mmc to RAM: +* COPY_BL2_FNPTR_ADDR: Address in iRAM, which Contains +* Pointer to API (Data transfer from mmc to ram) +*/ +void copy_uboot_to_ram(void) +{ +	u32 (*copy_bl2)(u32, u32, u32) = (void *) *(u32 *)COPY_BL2_FNPTR_ADDR; + +	copy_bl2(BL2_START_OFFSET, BL2_SIZE_BLOC_COUNT, CONFIG_SYS_TEXT_BASE); +} + +void board_init_f(unsigned long bootflag) +{ +	__attribute__((noreturn)) void (*uboot)(void); +	copy_uboot_to_ram(); + +	/* Jump to U-Boot image */ +	uboot = (void *)CONFIG_SYS_TEXT_BASE; +	(*uboot)(); +	/* Never returns Here */ +} + +/* Place Holders */ +void board_init_r(gd_t *id, ulong dest_addr) +{ +	/* Function attribute is no-return */ +	/* This Function never executes */ +	while (1) +		; +} + +void save_boot_params(u32 r0, u32 r1, u32 r2, u32 r3) {} diff --git a/include/configs/smdk5250.h b/include/configs/smdk5250.h index 67e4012de..f54d7ac44 100644 --- a/include/configs/smdk5250.h +++ b/include/configs/smdk5250.h @@ -102,6 +102,10 @@  #define CONFIG_BOOTDELAY		3  #define CONFIG_ZERO_BOOTDELAY_CHECK +/* MMC SPL */ +#define CONFIG_SPL +#define COPY_BL2_FNPTR_ADDR	0x02020030 +  #define CONFIG_BOOTCOMMAND	"mmc read 40007000 451 2000; bootm 40007000"  /* Miscellaneous configurable options */ @@ -178,6 +182,9 @@  #define CONFIG_BL2_OFFSET	(CONFIG_BL1_OFFSET + CONFIG_BL1_SIZE)  #define CONFIG_ENV_OFFSET	(CONFIG_BL2_OFFSET + CONFIG_BL2_SIZE) +/* U-boot copy size from boot Media to DRAM.*/ +#define BL2_START_OFFSET	(CONFIG_BL2_OFFSET/512) +#define BL2_SIZE_BLOC_COUNT	(CONFIG_BL2_SIZE/512)  #define CONFIG_DOS_PARTITION  #define CONFIG_IRAM_STACK	0x02050000 diff --git a/tools/Makefile b/tools/Makefile index 64bcc4db4..8993fdd7b 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -68,6 +68,7 @@ BIN_FILES-$(CONFIG_CMD_LOADS) += img2srec$(SFX)  BIN_FILES-$(CONFIG_XWAY_SWAP_BYTES) += xway-swap-bytes$(SFX)  BIN_FILES-y += mkenvimage$(SFX)  BIN_FILES-y += mkimage$(SFX) +BIN_FILES-$(CONFIG_SMDK5250) += mksmdk5250spl$(SFX)  BIN_FILES-$(CONFIG_MX28) += mxsboot$(SFX)  BIN_FILES-$(CONFIG_NETCONSOLE) += ncb$(SFX)  BIN_FILES-$(CONFIG_SHA1_CHECK_UB_IMG) += ubsha1$(SFX) @@ -94,6 +95,7 @@ NOPED_OBJ_FILES-y += imximage.o  NOPED_OBJ_FILES-y += omapimage.o  NOPED_OBJ_FILES-y += mkenvimage.o  NOPED_OBJ_FILES-y += mkimage.o +OBJ_FILES-$(CONFIG_SMDK5250) += mkexynosspl.o  OBJ_FILES-$(CONFIG_MX28) += mxsboot.o  OBJ_FILES-$(CONFIG_NETCONSOLE) += ncb.o  NOPED_OBJ_FILES-y += os_support.o @@ -213,6 +215,10 @@ $(obj)mkimage$(SFX):	$(obj)aisimage.o \  	$(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^  	$(HOSTSTRIP) $@ +$(obj)mk$(BOARD)spl$(SFX):	$(obj)mkexynosspl.o +	$(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^ +	$(HOSTSTRIP) $@ +  $(obj)mpc86x_clk$(SFX):	$(obj)mpc86x_clk.o  	$(HOSTCC) $(HOSTCFLAGS) $(HOSTLDFLAGS) -o $@ $^  	$(HOSTSTRIP) $@ diff --git a/tools/mkexynosspl.c b/tools/mkexynosspl.c new file mode 100644 index 000000000..6a8dd9373 --- /dev/null +++ b/tools/mkexynosspl.c @@ -0,0 +1,122 @@ +/* + * Copyright (C) 2012 Samsung Electronics + * + * See file CREDITS for list of people who contributed to this + * project. + * + * This program is free software; you can redistribute it and/or + * modify it under the terms of the GNU General Public License as + * published by the Free Software Foundation; either version 2 of + * the License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 59 Temple Place, Suite 330, Boston, + * MA 02111-1307 USA + */ + +#include <stdio.h> +#include <stdlib.h> +#include <unistd.h> +#include <fcntl.h> +#include <errno.h> +#include <string.h> +#include <sys/stat.h> +#include <compiler.h> + +#define CHECKSUM_OFFSET		(14*1024-4) +#define BUFSIZE			(14*1024) +#define FILE_PERM		(S_IRUSR | S_IWUSR | S_IRGRP \ +				| S_IWGRP | S_IROTH | S_IWOTH) +/* +* Requirement: +* IROM code reads first 14K bytes from boot device. +* It then calculates the checksum of 14K-4 bytes and compare with data at +* 14K-4 offset. +* +* This function takes two filenames: +* IN  "u-boot-spl.bin" and +* OUT "$(BOARD)-spl.bin as filenames. +* It reads the "u-boot-spl.bin" in 16K buffer. +* It calculates checksum of 14K-4 Bytes and stores at 14K-4 offset in buffer. +* It writes the buffer to "$(BOARD)-spl.bin" file. +*/ + +int main(int argc, char **argv) +{ +	unsigned char buffer[BUFSIZE]; +	int i, ifd, ofd; +	uint32_t checksum = 0; +	off_t	len; +	ssize_t count; +	struct stat stat; + +	if (argc != 3) { +		fprintf(stderr, "Usage: %s <infile> <outfile>\n", argv[0]); +		exit(EXIT_FAILURE); +	} + +	ifd = open(argv[1], O_RDONLY); +	if (ifd < 0) { +		fprintf(stderr, "%s: Can't open %s: %s\n", +			argv[0], argv[1], strerror(errno)); +		exit(EXIT_FAILURE); +	} + +	ofd = open(argv[2], O_WRONLY | O_CREAT | O_TRUNC, FILE_PERM); +	if (ifd < 0) { +		fprintf(stderr, "%s: Can't open %s: %s\n", +			argv[0], argv[2], strerror(errno)); +		close(ifd); +		exit(EXIT_FAILURE); +	} + +	if (fstat(ifd, &stat)) { +		fprintf(stderr, "%s: Unable to get size of %s: %s\n", +			argv[0], argv[1], strerror(errno)); +		close(ifd); +		close(ofd); +		exit(EXIT_FAILURE); +	} + +	len = stat.st_size; + +	count = (len < CHECKSUM_OFFSET) ? len : CHECKSUM_OFFSET; + +	if (read(ifd, buffer, count) != count) { +		fprintf(stderr, "%s: Can't read %s: %s\n", +			argv[0], argv[1], strerror(errno)); + +		close(ifd); +		close(ofd); + +		exit(EXIT_FAILURE); +	} + +	for (i = 0, checksum = 0; i < CHECKSUM_OFFSET; i++) +		checksum += buffer[i]; + +	checksum = cpu_to_le32(checksum); + +	memcpy(&buffer[CHECKSUM_OFFSET], &checksum, sizeof(checksum)); + +	if (write(ofd, buffer, BUFSIZE) != BUFSIZE) { +		fprintf(stderr, "%s: Can't write %s: %s\n", +			argv[0], argv[2], strerror(errno)); + +		close(ifd); +		close(ofd); + +		exit(EXIT_FAILURE); +	} + +	close(ifd); +	close(ofd); + +	return EXIT_SUCCESS; +} |