diff options
| author | Marek Szyprowski <m.szyprowski@samsung.com> | 2021-02-03 09:35:48 +0100 |
|---|---|---|
| committer | Marek Szyprowski <m.szyprowski@samsung.com> | 2021-11-16 13:00:22 +0100 |
| commit | 6eb9c32c3fd3c3734fe2c15e8fc55e186150ae0b (patch) | |
| tree | 45123340ce1ec42434f24ecae09c248d2ef4015e | |
| parent | 774dc21d8691d53711a06e31e0dcd37e2b05a4a3 (diff) | |
| download | u-boot-6eb9c32c3fd3c3734fe2c15e8fc55e186150ae0b.tar.gz u-boot-6eb9c32c3fd3c3734fe2c15e8fc55e186150ae0b.tar.bz2 u-boot-6eb9c32c3fd3c3734fe2c15e8fc55e186150ae0b.zip | |
samsung: tizen_amlogic: add support for optional mainline kernel boot
Add support for optional mainline Linux kernel and DTBs. This requires
adjusting DTB file nameand console kernel cmdline parameters.
Signed-off-by: Marek Szyprowski <m.szyprowski@samsung.com>
Change-Id: I977ec72596ddded6ed961ce0709ab40612682168
| -rw-r--r-- | include/samsung/tizen_amlogic.h | 9 | ||||
| -rw-r--r-- | tizen/bootscript/tizen-boot-amlogic-64b.scr | 6 |
2 files changed, 15 insertions, 0 deletions
diff --git a/include/samsung/tizen_amlogic.h b/include/samsung/tizen_amlogic.h index 9b6a0ff9e8..2d08853d72 100644 --- a/include/samsung/tizen_amlogic.h +++ b/include/samsung/tizen_amlogic.h @@ -24,6 +24,10 @@ "meson64_odroidc4.dtb fat -1 1;" \ "kvim3_linux.dtb fat -1 1;" \ "kvim3l_linux.dtb fat -1 1;" \ + "meson-g12b-odroid-n2.dtb fat -1 1;" \ + "meson-sm1-odroid-c4.dtb fat -1 1;" \ + "meson-g12b-a311d-khadas-vim3.dtb fat -1 1;" \ + "meson-sm1-khadas-vim3l.dtb fat -1 1;" \ "boot.scr.uimg fat -1 1;" \ "params-c4.bin fat -1 1;" \ "params-n2.bin fat -1 1;" \ @@ -96,24 +100,28 @@ #define TIZEN_BOOT_PREFIX "/kvim/ /" #define DFU_ALT_BOOT DFU_ALT_BOOT_VIM3 #define DEVICE_TREE_NAME "kvim3_linux.dtb" +#define NEXT_DEVICE_TREE_NAME "meson-g12b-a311d-khadas-vim3.dtb" #define BOARD_NAME "khadas-vim3" #define BUTTON_LABEL "Function" #elif CONFIG_TIZEN_KHADAS_VIM3L #define TIZEN_BOOT_PREFIX "/kvim/ /" #define DFU_ALT_BOOT DFU_ALT_BOOT_VIM3L #define DEVICE_TREE_NAME "kvim3l_linux.dtb" +#define NEXT_DEVICE_TREE_NAME "meson-sm1-khadas-vim3l.dtb" #define BOARD_NAME "khadas-vim3l" #define BUTTON_LABEL "Function" #elif CONFIG_TIZEN_ODROID_N2 #define TIZEN_BOOT_PREFIX "/odroid/ /" #define DFU_ALT_BOOT DFU_ALT_BOOT_ODROID_N2 #define DEVICE_TREE_NAME "meson64_odroidn2.dtb" +#define NEXT_DEVICE_TREE_NAME "meson-g12b-odroid-n2.dtb" #define BOARD_NAME "odrond-n2" #define BUTTON_LABEL "Nothing" #elif CONFIG_TIZEN_ODROID_C4 #define TIZEN_BOOT_PREFIX "/odroid/ /" #define DFU_ALT_BOOT DFU_ALT_BOOT_ODROID_C4 #define DEVICE_TREE_NAME "meson64_odroidc4.dtb" +#define NEXT_DEVICE_TREE_NAME "meson-sm1-odroid-c4.dtb" #define BOARD_NAME "odroid-c4" #define BUTTON_LABEL "PowerKey" #else @@ -163,6 +171,7 @@ "dfu_usb_con=0\0" \ "dfu_interface=mmc\0" \ "fdtfile=" DEVICE_TREE_NAME "\0" \ + "fdtfile2=" NEXT_DEVICE_TREE_NAME "\0" \ "board_name=" BOARD_NAME "\0" \ "boot_prefixes=" TIZEN_BOOT_PREFIX "\0" \ "mbr_parts=" PARTS_DEFAULT "\0" \ diff --git a/tizen/bootscript/tizen-boot-amlogic-64b.scr b/tizen/bootscript/tizen-boot-amlogic-64b.scr index 21790d2d38..c63a482456 100644 --- a/tizen/bootscript/tizen-boot-amlogic-64b.scr +++ b/tizen/bootscript/tizen-boot-amlogic-64b.scr @@ -85,6 +85,12 @@ else setenv bootmode normal fi +if test -e $bootdev $mmcbootdev:$mmcbootpart $fdtfile2; then; + setenv console console=ttyAML0,115200n8 earlycon + setenv fdtfile $fdtfile2 + setenv boot_prefixes "/" +fi + # setting console device if noting is set if test -z "${console}"; then; setenv console "console=ttyS0,115200n8 earlycon=aml-uart,0xff803000" |