diff options
| author | Tom Rini <trini@konsulko.com> | 2023-08-02 12:13:16 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2023-08-02 12:13:16 -0400 |
| commit | 38dedebc547f795efc3daad17f7c013c515e1285 (patch) | |
| tree | a56e2dc62406de041c67a18c25dff02d362f36bb /include | |
| parent | 7755b2200777f72dca87dd169138e95f011bbcb9 (diff) | |
| parent | 02be57caf730e2213bc844bf1dbe58bedd2c3734 (diff) | |
Merge https://source.denx.de/u-boot/custodians/u-boot-riscv
+ Fix compilation error for CI when enabling RTL8169 driver
+ Fix compilation error for pci_mmc.c by adding acpi_table header file
+ Support video console and usb keyboard on RISC-V QEMU virt machine
+ Support StarFive JH7110 PCIe driver
+ Enable PCI on Unmatched board
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/qemu-riscv.h | 15 | ||||
| -rw-r--r-- | include/stdio_dev.h | 2 |
2 files changed, 5 insertions, 12 deletions
diff --git a/include/configs/qemu-riscv.h b/include/configs/qemu-riscv.h index f6d326bda0d..584559cfa32 100644 --- a/include/configs/qemu-riscv.h +++ b/include/configs/qemu-riscv.h @@ -17,24 +17,19 @@ /* Environment options */ +#define CFG_STD_DEVICES_SETTINGS "stdin=serial,usbkbd\0" \ + "stdout=serial,vidconsole\0" \ + "stderr=serial,vidconsole\0" + #define BOOT_TARGET_DEVICES(func) \ - func(QEMU, qemu, na) \ func(VIRTIO, virtio, 0) \ func(SCSI, scsi, 0) \ func(DHCP, dhcp, na) #include <config_distro_bootcmd.h> -#define BOOTENV_DEV_QEMU(devtypeu, devtypel, instance) \ - "bootcmd_qemu=" \ - "if env exists kernel_start; then " \ - "bootm ${kernel_start} - ${fdtcontroladdr};" \ - "fi;\0" - -#define BOOTENV_DEV_NAME_QEMU(devtypeu, devtypel, instance) \ - "qemu " - #define CFG_EXTRA_ENV_SETTINGS \ + CFG_STD_DEVICES_SETTINGS \ "fdt_high=0xffffffffffffffff\0" \ "initrd_high=0xffffffffffffffff\0" \ "kernel_addr_r=0x84000000\0" \ diff --git a/include/stdio_dev.h b/include/stdio_dev.h index 77bf8a8970f..7f181020524 100644 --- a/include/stdio_dev.h +++ b/include/stdio_dev.h @@ -84,8 +84,6 @@ int stdio_init_tables(void); */ int stdio_add_devices(void); -void stdio_print_current_devices(void); - /** * stdio_deregister_dev() - deregister the device "devname". * |