diff options
| author | Tom Rini <trini@konsulko.com> | 2022-05-27 08:50:42 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2022-05-27 08:50:42 -0400 |
| commit | 4fe629d2e8bbda5f265e870d771b92be26e885f6 (patch) | |
| tree | cba5de7321cad9a8584c50c651a840f6728dde8f /include | |
| parent | 0fdc468b069b09bf176fe0255f3ef88f88ef3be0 (diff) | |
| parent | c544b281cd3e549a4fcbf4ba9a05a5d72c9557dd (diff) | |
| download | u-boot-4fe629d2e8bbda5f265e870d771b92be26e885f6.zip u-boot-4fe629d2e8bbda5f265e870d771b92be26e885f6.tar.gz u-boot-4fe629d2e8bbda5f265e870d771b92be26e885f6.tar.bz2 | |
Merge https://source.denx.de/u-boot/custodians/u-boot-riscv
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/qemu-riscv.h | 10 | ||||
| -rw-r--r-- | include/configs/sifive-unleashed.h | 10 | ||||
| -rw-r--r-- | include/configs/sifive-unmatched.h | 10 |
3 files changed, 17 insertions, 13 deletions
diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h index 618c3b6..f462895 100644 --- a/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h @@ -54,10 +54,12 @@ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ "kernel_addr_r=0x84000000\0" \ - "fdt_addr_r=0x88000000\0" \ - "scriptaddr=0x88100000\0" \ - "pxefile_addr_r=0x88200000\0" \ - "ramdisk_addr_r=0x88300000\0" \ + "kernel_comp_addr_r=0x88000000\0" \ + "kernel_comp_size=0x4000000\0" \ + "fdt_addr_r=0x8c000000\0" \ + "scriptaddr=0x8c100000\0" \ + "pxefile_addr_r=0x8c200000\0" \ + "ramdisk_addr_r=0x8c300000\0" \ BOOTENV #endif diff --git a/include/configs/sifive-unleashed.h b/include/configs/sifive-unleashed.h index 920f314..96e2eb6 100644 --- a/include/configs/sifive-unleashed.h +++ b/include/configs/sifive-unleashed.h @@ -61,12 +61,14 @@ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ "kernel_addr_r=0x84000000\0" \ - "fdt_addr_r=0x88000000\0" \ - "scriptaddr=0x88100000\0" \ + "kernel_comp_addr_r=0x88000000\0" \ + "kernel_comp_size=0x4000000\0" \ + "fdt_addr_r=0x8c000000\0" \ + "scriptaddr=0x8c100000\0" \ "script_offset_f=0x1fff000\0" \ "script_size_f=0x1000\0" \ - "pxefile_addr_r=0x88200000\0" \ - "ramdisk_addr_r=0x88300000\0" \ + "pxefile_addr_r=0x8c200000\0" \ + "ramdisk_addr_r=0x8c300000\0" \ "type_guid_gpt_loader1=" TYPE_GUID_LOADER1 "\0" \ "type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \ "type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \ diff --git a/include/configs/sifive-unmatched.h b/include/configs/sifive-unmatched.h index 0877646..fa734a6 100644 --- a/include/configs/sifive-unmatched.h +++ b/include/configs/sifive-unmatched.h @@ -56,12 +56,12 @@ #define CONFIG_EXTRA_ENV_SETTINGS \ "kernel_addr_r=0x84000000\0" \ - "fdt_addr_r=0x88000000\0" \ - "scriptaddr=0x88100000\0" \ - "pxefile_addr_r=0x88200000\0" \ - "ramdisk_addr_r=0x88300000\0" \ - "kernel_comp_addr_r=0x90000000\0" \ + "kernel_comp_addr_r=0x88000000\0" \ "kernel_comp_size=0x4000000\0" \ + "fdt_addr_r=0x8c000000\0" \ + "scriptaddr=0x8c100000\0" \ + "pxefile_addr_r=0x8c200000\0" \ + "ramdisk_addr_r=0x8c300000\0" \ "type_guid_gpt_loader1=" TYPE_GUID_LOADER1 "\0" \ "type_guid_gpt_loader2=" TYPE_GUID_LOADER2 "\0" \ "type_guid_gpt_system=" TYPE_GUID_SYSTEM "\0" \ |