diff --git a/include/config_distro_defaults.h b/include/config_distro_defaults.h index 766a212..0df77cd 100644 --- a/include/config_distro_defaults.h +++ b/include/config_distro_defaults.h @@ -57,4 +57,7 @@ #define CONFIG_SUPPORT_RAW_INITRD #define CONFIG_ENV_VARS_UBOOT_CONFIG +#define CONFIG_CMD_PART +#define CONFIG_PARTITION_UUIDS + #endif /* _CONFIG_CMD_DISTRO_DEFAULTS_H */ diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 94275a7..ed1aac6 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -173,7 +173,7 @@ #define CONFIG_SYS_NO_FLASH #define CONFIG_SYS_MONITOR_LEN (768 << 10) /* 768 KiB */ -#define CONFIG_IDENT_STRING " Allwinner Technology" +#define CONFIG_IDENT_STRING " Parabola GNU/Linux-libre" #define CONFIG_DISPLAY_BOARDINFO #define CONFIG_ENV_OFFSET (544 << 10) /* (8 + 24 + 512) KiB */ @@ -467,6 +467,9 @@ extern int soft_i2c_gpio_scl; #define BOOTENV_DEV_NAME_FEL(devtypeu, devtypel, instance) \ "fel " +/* Enable Extlinux boot support */ +#define CONFIG_CMD_PXE +#define CONFIG_MENU #define BOOT_TARGET_DEVICES(func) \ func(FEL, fel, na) \ BOOT_TARGET_DEVICES_MMC(func) \ @@ -475,6 +478,7 @@ extern int soft_i2c_gpio_scl; BOOT_TARGET_DEVICES_USB(func) \ func(PXE, pxe, na) \ func(DHCP, dhcp, na) +#include #ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT #define BOOTCMD_SUNXI_COMPAT \ @@ -492,8 +496,6 @@ extern int soft_i2c_gpio_scl; #define BOOTCMD_SUNXI_COMPAT #endif -#include - #ifdef CONFIG_USB_KEYBOARD #define CONSOLE_STDIN_SETTINGS \ "preboot=usb start\0" \ @@ -518,13 +520,13 @@ extern int soft_i2c_gpio_scl; CONSOLE_STDOUT_SETTINGS #define CONFIG_EXTRA_ENV_SETTINGS \ + BOOTENV \ CONSOLE_ENV_SETTINGS \ MEM_LAYOUT_ENV_SETTINGS \ DFU_ALT_INFO_RAM \ "fdtfile=" CONFIG_DEFAULT_DEVICE_TREE ".dtb\0" \ "console=ttyS0,115200\0" \ - BOOTCMD_SUNXI_COMPAT \ - BOOTENV + BOOTCMD_SUNXI_COMPAT #else /* ifndef CONFIG_SPL_BUILD */ #define CONFIG_EXTRA_ENV_SETTINGS -- 2.8.3