diff options
| author |   Tom Rini <trini@konsulko.com> | 2018-05-15 16:19:36 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2018-05-15 16:19:36 -0400 |
| commit | accd05c8772e9c03589da9ef32f8bea431f22bb6 (patch) | |
| tree | b70f1306f40ee7e5704adb81b17f59bdcfebedab | |
| parent | 3fdcc9f3381839200ea919de6cf166a7ccecdbca (diff) | |
[COMMUNITY] U-Boot: Backport increase to CBSIZE/etc
Starting with v2017.09 of upstream U-Boot the console buffer and maxargs
have been greatly increased. This is important for passing in longer
kernel command lines to the kernel as is done in CI.
Change-Id: I996aa7cec7a92b7d6d329a55edd24e85dbd81203
Bug-AGL: SPEC-1434
Signed-off-by: Tom Rini <trini@konsulko.com>
| -rw-r--r-- | meta-rcar-gen3/recipes-bsp/u-boot/u-boot/0001-ARM-rmobile-Increase-console-buffer-sizes.patch | 33 | ||||
| -rw-r--r-- | meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bb | 3 |
2 files changed, 35 insertions, 1 deletions
diff --git a/meta-rcar-gen3/recipes-bsp/u-boot/u-boot/0001-ARM-rmobile-Increase-console-buffer-sizes.patch b/meta-rcar-gen3/recipes-bsp/u-boot/u-boot/0001-ARM-rmobile-Increase-console-buffer-sizes.patch new file mode 100644 index 0000000..9b20b93 --- /dev/null +++ b/meta-rcar-gen3/recipes-bsp/u-boot/u-boot/0001-ARM-rmobile-Increase-console-buffer-sizes.patch @@ -0,0 +1,33 @@ +From 48aa8126768fa5ba2fc3eee18722b5a7f9e145ff Mon Sep 17 00:00:00 2001 +From: Marek Vasut <marek.vasut@gmail.com> +Date: Fri, 21 Jul 2017 23:16:08 +0200 +Subject: [PATCH 1/1] ARM: rmobile: Increase console buffer sizes + +Allow pasting extra long lines into the U-Boot console on RCar Gen3. +This is OK since we have plenty of resources and it's convenient. + +Signed-off-by: Marek Vasut <marek.vasut+renesas@gmail.com> +Cc: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> +Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org> +--- +diff --git a/include/configs/rcar-gen3-common.h b/include/configs/rcar-gen3-common.h +index 6b58d208723e..1ba16a30fba8 100644 +--- a/include/configs/rcar-gen3-common.h ++++ b/include/configs/rcar-gen3-common.h +@@ -87,11 +87,12 @@ + #undef CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE + #undef CONFIG_SYS_CONSOLE_ENV_OVERWRITE + ++#define CONFIG_SYS_CBSIZE 2048 ++#define CONFIG_SYS_PBSIZE \ ++ (CONFIG_SYS_CBSIZE + sizeof(CONFIG_SYS_PROMPT) + 16) ++#define CONFIG_SYS_BARGSIZE CONFIG_SYS_CBSIZE + #define CONFIG_SYS_LONGHELP +-#define CONFIG_SYS_CBSIZE 256 +-#define CONFIG_SYS_PBSIZE 256 +-#define CONFIG_SYS_MAXARGS 16 +-#define CONFIG_SYS_BARGSIZE 512 ++#define CONFIG_SYS_MAXARGS 64 + #define CONFIG_SYS_BAUDRATE_TABLE { 115200, 38400 } + + /* MEMORY */ diff --git a/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bb b/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bb index bf043e2..380eb08 100644 --- a/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bb +++ b/meta-rcar-gen3/recipes-bsp/u-boot/u-boot_2015.04.bb @@ -9,7 +9,8 @@ BRANCH = "v2015.04/rcar-3.6.1" LICENSE = "GPLv2+" LIC_FILES_CHKSUM = "file://Licenses/README;md5=c7383a594871c03da76b3707929d2919" -SRC_URI = "${UBOOT_URL};branch=${BRANCH}" +SRC_URI = "${UBOOT_URL};branch=${BRANCH} \ + file://0001-ARM-rmobile-Increase-console-buffer-sizes.patch" SRCREV = "9d718378c4e48d043832f2c2067eb08478c19c53" PV = "v2015.04+git${SRCPV}" |