diff options
| -rw-r--r-- | Kconfig | 1 | ||||
| -rw-r--r-- | configs/odroid-c2_defconfig | 1 | ||||
| -rw-r--r-- | include/configs/meson-gxbb-common.h | 14 | ||||
| -rw-r--r-- | include/configs/odroid-c2.h | 2 |
4 files changed, 17 insertions, 1 deletions
@@ -57,6 +57,7 @@ config DISTRO_DEFAULTS bool "Select defaults suitable for booting general purpose Linux distributions" default y if ARCH_SUNXI || TEGRA default y if ARCH_LS2080A + default y if ARCH_MESON default y if ARCH_ROCKCHIP default n select CMD_BOOTZ if ARM && !ARM64 diff --git a/configs/odroid-c2_defconfig b/configs/odroid-c2_defconfig index 7d0b2b1835..119ab07038 100644 --- a/configs/odroid-c2_defconfig +++ b/configs/odroid-c2_defconfig @@ -13,7 +13,6 @@ CONFIG_HUSH_PARSER=y # CONFIG_CMD_IMLS is not set # CONFIG_CMD_LOADS is not set # CONFIG_CMD_FPGA is not set -# CONFIG_CMD_SOURCE is not set # CONFIG_CMD_SETEXPR is not set CONFIG_OF_CONTROL=y CONFIG_NET_RANDOM_ETHADDR=y diff --git a/include/configs/meson-gxbb-common.h b/include/configs/meson-gxbb-common.h index ab62cff7ca..17e81b4540 100644 --- a/include/configs/meson-gxbb-common.h +++ b/include/configs/meson-gxbb-common.h @@ -39,4 +39,18 @@ #include <config_distro_defaults.h> +#define BOOT_TARGET_DEVICES(func) \ + func(DHCP, dhcp, na) + +#include <config_distro_bootcmd.h> + +#define CONFIG_EXTRA_ENV_SETTINGS \ + "fdt_addr_r=0x01000000\0" \ + "scriptaddr=0x1f000000\0" \ + "kernel_addr_r=0x01080000\0" \ + "pxefile_addr_r=0x01080000\0" \ + "ramdisk_addr_r=0x10000000\0" \ + MESON_FDTFILE_SETTING \ + BOOTENV + #endif /* __MESON_GXBB_COMMON_CONFIG_H */ diff --git a/include/configs/odroid-c2.h b/include/configs/odroid-c2.h index eb41818ed7..48f4a68549 100644 --- a/include/configs/odroid-c2.h +++ b/include/configs/odroid-c2.h @@ -14,6 +14,8 @@ #define CONFIG_CONS_INDEX 0 #define CONFIG_BAUDRATE 115200 +#define MESON_FDTFILE_SETTING "fdtfile=amlogic/meson-gxbb-odroidc2.dtb\0" + #include <configs/meson-gxbb-common.h> #endif /* __CONFIG_H */ |