summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSimon Glass <sjg@chromium.org>2021-11-24 19:26:46 +0300
committerSimon Glass <sjg@chromium.org>2021-12-05 19:26:26 +0300
commit36cc7bfd54cf104a13bd0a6a5cd43e146547ce6b (patch)
treee76ebfb080f3e64cc2fefdda608ec8af9e8c86db
parent6ce2237a4076a323e6dcaa92c6f22a149fef6f28 (diff)
downloadu-boot-36cc7bfd54cf104a13bd0a6a5cd43e146547ce6b.tar.xz
sandbox: Drop CONFIG_SYS_TIMER_RATE
This is not used by sandbox since it uses driver model for the timer. Drop it. Also update the tools_only build to avoid build errors, since it does actually build U-Boot too. Enable DM so we can use CONFIG_TIMER, disable EFI_LOADER to avoid an error about board_quiesce_devices() and disable NET to avoid having to define CONFIG_AVB_BUF_ADDR Signed-off-by: Simon Glass <sjg@chromium.org>
-rw-r--r--configs/tools-only_defconfig7
-rw-r--r--include/configs/sandbox.h4
2 files changed, 3 insertions, 8 deletions
diff --git a/configs/tools-only_defconfig b/configs/tools-only_defconfig
index 400b050147..5ffc625b0d 100644
--- a/configs/tools-only_defconfig
+++ b/configs/tools-only_defconfig
@@ -13,23 +13,22 @@ CONFIG_MISC_INIT_F=y
# CONFIG_CMD_BOOTM is not set
# CONFIG_CMD_ELF is not set
# CONFIG_CMD_EXTENSION is not set
-CONFIG_BOOTP_DNS2=y
# CONFIG_CMD_DATE is not set
CONFIG_OF_CONTROL=y
CONFIG_SYS_RELOC_GD_ENV_ADDR=y
-CONFIG_BOOTP_SEND_HOSTNAME=y
-CONFIG_IP_DEFRAG=y
+# CONFIG_NET is not set
# CONFIG_ACPIGEN is not set
CONFIG_AXI=y
CONFIG_AXI_SANDBOX=y
-# CONFIG_UDP_FUNCTION_FASTBOOT is not set
CONFIG_SANDBOX_GPIO=y
CONFIG_PCI=y
CONFIG_PCI_SANDBOX=y
CONFIG_DM_RTC=y
CONFIG_SOUND=y
CONFIG_SYSRESET=y
+CONFIG_TIMER=y
CONFIG_I2C_EDID=y
# CONFIG_VIRTIO_MMIO is not set
# CONFIG_VIRTIO_PCI is not set
# CONFIG_VIRTIO_SANDBOX is not set
+# CONFIG_EFI_LOADER is not set
diff --git a/include/configs/sandbox.h b/include/configs/sandbox.h
index d0adcfd75e..0458c72360 100644
--- a/include/configs/sandbox.h
+++ b/include/configs/sandbox.h
@@ -10,10 +10,6 @@
#define CONFIG_IO_TRACE
#endif
-#ifndef CONFIG_TIMER
-#define CONFIG_SYS_TIMER_RATE 1000000
-#endif
-
#define CONFIG_MALLOC_F_ADDR 0x0010000
#define CONFIG_SYS_CBSIZE 1024 /* Console I/O Buffer Size */