aboutsummaryrefslogtreecommitdiffstats
path: root/package/boot/uboot-oxnas/files/common
diff options
context:
space:
mode:
authorJohn Crispin <john@openwrt.org>2014-11-26 09:00:17 +0000
committerJohn Crispin <john@openwrt.org>2014-11-26 09:00:17 +0000
commitc05048b0bb686bfa927d3a4848127b9052549fb1 (patch)
tree2c546927f7bdac026bfeda08e9856d5eef738b66 /package/boot/uboot-oxnas/files/common
parent72b58f2eb12ad4aa0c59481d0911dc5e39180eb5 (diff)
downloadupstream-c05048b0bb686bfa927d3a4848127b9052549fb1.tar.gz
upstream-c05048b0bb686bfa927d3a4848127b9052549fb1.tar.bz2
upstream-c05048b0bb686bfa927d3a4848127b9052549fb1.zip
add uboot-oxnas
This adds support for the oxnas target in U-Boot 2014.04 History can be found at https://github.com/kref/u-boot-oxnas up to 2013.10 changes from 2013.10 to 2014.04 can be followed at https://gitorious.org/openwrt-oxnas Signed-off-by: Daniel Golle <daniel@makrotopia.org> SVN-Revision: 43389
Diffstat (limited to 'package/boot/uboot-oxnas/files/common')
-rw-r--r--package/boot/uboot-oxnas/files/common/env_ext4.c116
-rw-r--r--package/boot/uboot-oxnas/files/common/spl/spl_block.c236
2 files changed, 352 insertions, 0 deletions
diff --git a/package/boot/uboot-oxnas/files/common/env_ext4.c b/package/boot/uboot-oxnas/files/common/env_ext4.c
new file mode 100644
index 0000000000..e98d94dae9
--- /dev/null
+++ b/package/boot/uboot-oxnas/files/common/env_ext4.c
@@ -0,0 +1,116 @@
+/*
+ * (c) Copyright 2011 by Tigris Elektronik GmbH
+ *
+ * Author:
+ * Maximilian Schwerin <mvs@tigris.de>
+ *
+ * SPDX-License-Identifier: GPL-2.0+
+ */
+
+#include <common.h>
+
+#include <command.h>
+#include <environment.h>
+#include <linux/stddef.h>
+#include <malloc.h>
+#include <search.h>
+#include <errno.h>
+#include <ext4fs.h>
+
+char *env_name_spec = "EXT4";
+
+env_t *env_ptr;
+
+DECLARE_GLOBAL_DATA_PTR;
+
+int env_init(void)
+{
+ /* use default */
+ gd->env_addr = (ulong)&default_environment[0];
+ gd->env_valid = 1;
+
+ return 0;
+}
+
+#ifdef CONFIG_CMD_SAVEENV
+int saveenv(void)
+{
+ env_t env_new;
+ ssize_t len;
+ char *res;
+ block_dev_desc_t *dev_desc = NULL;
+ int dev = EXT4_ENV_DEVICE;
+ int part = EXT4_ENV_PART;
+ int err;
+
+ res = (char *)&env_new.data;
+ len = hexport_r(&env_htab, '\0', 0, &res, ENV_SIZE, 0, NULL);
+ if (len < 0) {
+ error("Cannot export environment: errno = %d\n", errno);
+ return 1;
+ }
+
+ dev_desc = get_dev(EXT4_ENV_INTERFACE, dev);
+ if (dev_desc == NULL) {
+ printf("Failed to find %s%d\n",
+ EXT4_ENV_INTERFACE, dev);
+ return 1;
+ }
+
+ err = ext4_register_device(dev_desc, part);
+ if (err) {
+ printf("Failed to register %s%d:%d\n",
+ EXT4_ENV_INTERFACE, dev, part);
+ return 1;
+ }
+
+ env_new.crc = crc32(0, env_new.data, ENV_SIZE);
+ err = ext4fs_write(EXT4_ENV_FILE, (void *)&env_new, sizeof(env_t));
+ ext4fs_close();
+ if (err == -1) {
+ printf("\n** Unable to write \"%s\" from %s%d:%d **\n",
+ EXT4_ENV_FILE, EXT4_ENV_INTERFACE, dev, part);
+ return 1;
+ }
+
+ puts("done\n");
+ return 0;
+}
+#endif /* CONFIG_CMD_SAVEENV */
+
+void env_relocate_spec(void)
+{
+ char buf[CONFIG_ENV_SIZE];
+ block_dev_desc_t *dev_desc = NULL;
+ int dev = EXT4_ENV_DEVICE;
+ int part = EXT4_ENV_PART;
+ int err;
+
+ dev_desc = get_dev(EXT4_ENV_INTERFACE, dev);
+ if (dev_desc == NULL) {
+ printf("Failed to find %s%d\n",
+ EXT4_ENV_INTERFACE, dev);
+ set_default_env(NULL);
+ return;
+ }
+
+ err = ext4_register_device(dev_desc, part);
+ if (err) {
+ printf("Failed to register %s%d:%d\n",
+ EXT4_ENV_INTERFACE, dev, part);
+ set_default_env(NULL);
+ return;
+ }
+
+ err = ext4_read_file(EXT4_ENV_FILE, (uchar *)&buf, 0, CONFIG_ENV_SIZE);
+ ext4fs_close();
+
+ if (err == -1) {
+ printf("\n** Unable to read \"%s\" from %s%d:%d **\n",
+ EXT4_ENV_FILE, EXT4_ENV_INTERFACE, dev, part);
+ set_default_env(NULL);
+ return;
+ }
+
+ env_import(buf, 1);
+}
diff --git a/package/boot/uboot-oxnas/files/common/spl/spl_block.c b/package/boot/uboot-oxnas/files/common/spl/spl_block.c
new file mode 100644
index 0000000000..f16413aff7
--- /dev/null
+++ b/package/boot/uboot-oxnas/files/common/spl/spl_block.c
@@ -0,0 +1,236 @@
+/*
+ * (C) Copyright 2013
+ *
+ * Ma Haijun <mahaijuns@gmail.com>
+ *
+ * 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 <spl.h>
+#include <asm/u-boot.h>
+#include <asm/utils.h>
+#include <version.h>
+#include <part.h>
+#include <fat.h>
+#include <ext4fs.h>
+
+/* should be implemented by board */
+extern void spl_block_device_init(void);
+
+block_dev_desc_t * spl_get_block_device(void)
+{
+ block_dev_desc_t * device;
+
+ spl_block_device_init();
+
+ device = get_dev(CONFIG_SPL_BLOCKDEV_INTERFACE, CONFIG_SPL_BLOCKDEV_ID);
+ if (!device) {
+ printf("blk device %s%d not exists\n",
+ CONFIG_SPL_BLOCKDEV_INTERFACE,
+ CONFIG_SPL_BLOCKDEV_ID);
+ hang();
+ }
+
+ return device;
+}
+
+#ifdef CONFIG_SPL_FAT_SUPPORT
+static int block_load_image_fat(const char *filename)
+{
+ int err;
+ struct image_header *header;
+
+ header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
+ sizeof(struct image_header));
+
+ err = file_fat_read(filename, header, sizeof(struct image_header));
+ if (err <= 0)
+ goto end;
+
+ spl_parse_image_header(header);
+
+ err = file_fat_read(filename, (u8 *)spl_image.load_addr, 0);
+
+end:
+ if (err <= 0)
+ printf("spl: error reading image %s, err - %d\n",
+ filename, err);
+
+ return (err <= 0);
+}
+
+#ifdef CONFIG_SPL_OS_BOOT
+static int block_load_image_fat_os(void)
+{
+ int err;
+
+ err = file_fat_read(CONFIG_SPL_FAT_LOAD_ARGS_NAME,
+ (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0);
+ if (err <= 0) {
+ return -1;
+ }
+
+ return block_load_image_fat(CONFIG_SPL_FAT_LOAD_KERNEL_NAME);
+}
+#endif
+
+void spl_block_load_image(void)
+{
+ int err;
+ block_dev_desc_t * device;
+
+ device = spl_get_block_device();
+ err = fat_register_device(device, CONFIG_BLOCKDEV_FAT_BOOT_PARTITION);
+ if (err) {
+ printf("spl: fat register err - %d\n", err);
+ hang();
+ }
+#ifdef CONFIG_SPL_OS_BOOT
+ if (spl_start_uboot() || block_load_image_fat_os())
+#endif
+ {
+ err = block_load_image_fat(CONFIG_SPL_FAT_LOAD_PAYLOAD_NAME);
+ if (err)
+ hang();
+ }
+}
+#elif defined(CONFIG_SPL_EXT4_SUPPORT) /* end CONFIG_SPL_FAT_SUPPORT */
+static int block_load_image_ext4(const char *filename)
+{
+ int err;
+ struct image_header *header;
+
+ header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
+ sizeof(struct image_header));
+
+ err = ext4_read_file(filename, header, 0, sizeof(struct image_header));
+ if (err <= 0)
+ goto end;
+
+ spl_parse_image_header(header);
+
+ err = ext4_read_file(filename, (u8 *)spl_image.load_addr, 0, 0);
+
+end:
+ return (err <= 0);
+}
+
+#ifdef CONFIG_SPL_OS_BOOT
+static int block_load_image_ext4_os(void)
+{
+ int err;
+
+ err = ext4_read_file(CONFIG_SPL_EXT4_LOAD_ARGS_NAME,
+ (void *)CONFIG_SYS_SPL_ARGS_ADDR, 0, 0);
+ if (err <= 0) {
+ return -1;
+ }
+
+ return block_load_image_ext4(CONFIG_SPL_EXT4_LOAD_KERNEL_NAME);
+}
+#endif
+
+void spl_block_load_image(void)
+{
+ int err;
+ block_dev_desc_t * device;
+
+ device = spl_get_block_device();
+ err = ext4_register_device(device, CONFIG_BLOCKDEV_EXT4_BOOT_PARTITION);
+ if (err) {
+ hang();
+ }
+#ifdef CONFIG_SPL_OS_BOOT
+ if (spl_start_uboot() || block_load_image_ext4_os())
+#endif
+ {
+ err = block_load_image_ext4(CONFIG_SPL_EXT4_LOAD_PAYLOAD_NAME);
+ if (err)
+ hang();
+ }
+}
+#else /* end CONFIG_SPL_EXT4_SUPPORT */
+static int block_load_image_raw(block_dev_desc_t * device, lbaint_t sector)
+{
+ int n;
+ u32 image_size_sectors;
+ struct image_header *header;
+
+ header = (struct image_header *)(CONFIG_SYS_TEXT_BASE -
+ sizeof(struct image_header));
+
+ /* read image header to find the image size & load address */
+ n = device->block_read(device->dev, sector, 1, header);
+
+ if (n != 1) {
+ printf("spl: blk read err\n");
+ return 1;
+ }
+
+ spl_parse_image_header(header);
+
+ /* convert size to sectors - round up */
+ image_size_sectors = (spl_image.size + 512 - 1) / 512;
+ n = device->block_read(device->dev, sector, image_size_sectors,
+ (void *)spl_image.load_addr);
+
+ if (n != image_size_sectors) {
+ printf("spl: blk read err\n");
+ return 1;
+ }
+ return 0;
+}
+
+#ifdef CONFIG_SPL_OS_BOOT
+static int block_load_image_raw_os(block_dev_desc_t * device)
+{
+ int n;
+
+ n = device->block_read(device->dev, CONFIG_SYS_BLOCK_RAW_MODE_ARGS_SECTOR,
+ CONFIG_SYS_BLOCK_RAW_MODE_ARGS_SECTORS,
+ (u32 *)CONFIG_SYS_SPL_ARGS_ADDR);
+ /* flush cache after read */
+ flush_cache(addr, CONFIG_SYS_BLOCK_RAW_MODE_ARGS_SECTORS * 512);
+
+ if (n != CONFIG_SYS_BLOCK_RAW_MODE_ARGS_SECTORS) {
+ printf("args blk read error\n");
+ return -1;
+ }
+
+ return block_load_image_raw(device, CONFIG_SYS_BLOCK_RAW_MODE_KERNEL_SECTOR);
+}
+#endif
+
+void spl_block_load_image(void)
+{
+ int err;
+ block_dev_desc_t * device;
+
+ device = spl_get_block_device();
+#ifdef CONFIG_SPL_OS_BOOT
+ if (spl_start_uboot() || block_load_image_raw_os(device))
+#endif
+ {
+ err = block_load_image_raw(device,
+ CONFIG_SYS_BLOCK_RAW_MODE_U_BOOT_SECTOR);
+ if (err)
+ hang();
+ }
+}
+#endif /* CONFIG_SPL_FAT_SUPPORT */