diff options
| -rw-r--r-- | package/u-boot/files/fw_env.config | 1 | ||||
| -rwxr-xr-x | package/u-boot/files/uboot_print_env | 5 | ||||
| -rwxr-xr-x | package/u-boot/files/uboot_set_env | 5 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-arch_arm_lib_bootm_c | 13 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-common_cmd_bootmenu_c | 11 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-include_configs_rpi_h | 44 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-include_env_default_h | 11 | ||||
| -rw-r--r-- | package/u-boot/patches/patch-tools_env_fw_env_h | 11 |
8 files changed, 101 insertions, 0 deletions
diff --git a/package/u-boot/files/fw_env.config b/package/u-boot/files/fw_env.config new file mode 100644 index 000000000..5571d60e0 --- /dev/null +++ b/package/u-boot/files/fw_env.config @@ -0,0 +1 @@ +/mnt/uboot.env 0x0000 0x4000 diff --git a/package/u-boot/files/uboot_print_env b/package/u-boot/files/uboot_print_env new file mode 100755 index 000000000..7231e1a47 --- /dev/null +++ b/package/u-boot/files/uboot_print_env @@ -0,0 +1,5 @@ +#!/bin/sh + +mount -r /dev/mmcblk0p1 /mnt +fw_printenv "$@" +umount /mnt diff --git a/package/u-boot/files/uboot_set_env b/package/u-boot/files/uboot_set_env new file mode 100755 index 000000000..7b5a33ccc --- /dev/null +++ b/package/u-boot/files/uboot_set_env @@ -0,0 +1,5 @@ +#!/bin/sh + +mount /dev/mmcblk0p1 /mnt +fw_setenv "$@" +umount /mnt diff --git a/package/u-boot/patches/patch-arch_arm_lib_bootm_c b/package/u-boot/patches/patch-arch_arm_lib_bootm_c new file mode 100644 index 000000000..1498f47dd --- /dev/null +++ b/package/u-boot/patches/patch-arch_arm_lib_bootm_c @@ -0,0 +1,13 @@ +--- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/arch/arm/lib/bootm.c 2015-01-06 09:00:23.000000000 +0100 ++++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/arch/arm/lib/bootm.c 2015-01-07 18:11:45.971158851 +0100 +@@ -70,8 +70,8 @@ void arch_lmb_reserve(struct lmb *lmb) + */ + static void announce_and_cleanup(int fake) + { +- printf("\nStarting kernel ...%s\n\n", fake ? +- "(fake run for tracing)" : ""); ++ //printf("\nStarting kernel ...%s\n\n", fake ? ++ // "(fake run for tracing)" : ""); + bootstage_mark_name(BOOTSTAGE_ID_BOOTM_HANDOFF, "start_kernel"); + #ifdef CONFIG_BOOTSTAGE_FDT + bootstage_fdt_add_report(); diff --git a/package/u-boot/patches/patch-common_cmd_bootmenu_c b/package/u-boot/patches/patch-common_cmd_bootmenu_c new file mode 100644 index 000000000..ac0d02916 --- /dev/null +++ b/package/u-boot/patches/patch-common_cmd_bootmenu_c @@ -0,0 +1,11 @@ +--- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/common/cmd_bootmenu.c 2015-01-06 09:00:23.000000000 +0100 ++++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/common/cmd_bootmenu.c 2015-01-07 17:51:11.947152887 +0100 +@@ -423,7 +423,7 @@ cleanup: + } + + if (title && command) { +- debug("Starting entry '%s'\n", title); ++ //debug("Starting entry '%s'\n", title); + free(title); + run_command(command, 0); + free(command); diff --git a/package/u-boot/patches/patch-include_configs_rpi_h b/package/u-boot/patches/patch-include_configs_rpi_h new file mode 100644 index 000000000..13774f2d2 --- /dev/null +++ b/package/u-boot/patches/patch-include_configs_rpi_h @@ -0,0 +1,44 @@ +--- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/include/configs/rpi.h 2015-01-06 09:00:23.000000000 +0100 ++++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/include/configs/rpi.h 2015-01-07 18:05:13.563156954 +0100 +@@ -19,6 +19,8 @@ + + #include <linux/sizes.h> + ++#undef DEBUG ++ + /* Architecture, CPU, etc.*/ + #define CONFIG_SYS_GENERIC_BOARD + #define CONFIG_BCM2835 +@@ -96,7 +98,7 @@ + /* Console UART */ + #define CONFIG_PL01X_SERIAL + #define CONFIG_CONS_INDEX 0 +-#define CONFIG_BAUDRATE 115200 ++#define CONFIG_BAUDRATE 9600 + + /* Console configuration */ + #define CONFIG_SYS_CBSIZE 1024 +@@ -117,7 +119,7 @@ + + /* Shell */ + #define CONFIG_SYS_MAXARGS 8 +-#define CONFIG_SYS_PROMPT "U-Boot> " ++#define CONFIG_SYS_PROMPT "CONET-Boot> " + #define CONFIG_COMMAND_HISTORY + + /* Commands */ +@@ -185,9 +187,12 @@ + + #define CONFIG_EXTRA_ENV_SETTINGS \ + ENV_DEVICE_SETTINGS \ +- ENV_MEM_LAYOUT_SETTINGS \ +- BOOTENV ++ ENV_MEM_LAYOUT_SETTINGS + + #define CONFIG_BOOTDELAY 2 ++#define CONFIG_CMD_BOOTMENU ++#define CONFIG_MENU ++#define CONFIG_AUTOBOOT_KEYED ++#define CONFIG_MENU_SHOW + + #endif diff --git a/package/u-boot/patches/patch-include_env_default_h b/package/u-boot/patches/patch-include_env_default_h new file mode 100644 index 000000000..2a03dfb31 --- /dev/null +++ b/package/u-boot/patches/patch-include_env_default_h @@ -0,0 +1,11 @@ +--- u-boot-2015.01.orig/include/env_default.h 2015-01-12 15:39:08.000000000 +0100 ++++ u-boot-2015.01/include/env_default.h 2015-02-16 10:23:23.123639584 +0100 +@@ -8,6 +8,8 @@ + * SPDX-License-Identifier: GPL-2.0+ + */ + ++#include <generated/autoconf.h> ++ + #include <env_callback.h> + + #ifdef DEFAULT_ENV_INSTANCE_EMBEDDED diff --git a/package/u-boot/patches/patch-tools_env_fw_env_h b/package/u-boot/patches/patch-tools_env_fw_env_h new file mode 100644 index 000000000..53548351f --- /dev/null +++ b/package/u-boot/patches/patch-tools_env_fw_env_h @@ -0,0 +1,11 @@ +--- u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af.orig/tools/env/fw_env.h 2015-01-06 09:00:23.000000000 +0100 ++++ u-boot-d8bec60c1b0de7770f9b56ad092ab9be801d99af/tools/env/fw_env.h 2015-01-07 13:13:44.399072426 +0100 +@@ -14,6 +14,8 @@ + #include <config.h> + #endif + ++#include <generated/autoconf.h> ++ + /* + * To build the utility with the static configuration + * comment out the next line. |