diff options
| author | Philipp Tomsich <philipp.tomsich@theobroma-systems.com> | 2017-01-25 11:53:57 +0100 |
|---|---|---|
| committer | Philipp Tomsich <philipp.tomsich@theobroma-systems.com> | 2017-03-09 01:40:13 +0100 |
| commit | 0a281b904507e569447bef89c4758fa5faf63d88 (patch) | |
| tree | 017bea0b9a56123d4c01bf86653869e05dd0ccbf /include | |
| parent | b26777160f6350ffc36e00b8d1a7c3b6b4490051 (diff) | |
[fix] remove duplicate defines in sunxi-common.h after rebase
Diffstat (limited to 'include')
| -rw-r--r-- | include/configs/sunxi-common.h | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 6c6d98908e..4473d11bda 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -41,11 +41,6 @@ #include <asm/arch/cpu.h> /* get chip and board defs */ -/* - * Display CPU information - */ -#define CONFIG_DISPLAY_CPUINFO - #ifdef CONFIG_SUNXI_PANGOLIN # undef CONFIG_SYS_PROMPT # define CONFIG_SYS_PROMPT "u-boot# " @@ -385,13 +380,9 @@ extern int soft_i2c_gpio_scl; #endif #ifdef CONFIG_USB_FUNCTION_FASTBOOT -#define CONFIG_CMD_FASTBOOT -#define CONFIG_FASTBOOT_BUF_ADDR CONFIG_SYS_LOAD_ADDR #define CONFIG_FASTBOOT_BUF_SIZE 0x8000000 -#define CONFIG_ANDROID_BOOT_IMAGE #define CONFIG_SYS_BOOTM_LEN 0x1000000 -#define CONFIG_FASTBOOT_FLASH #define CONFIG_SUNXI_FASTBOOT_GPIO "PM7" #ifdef CONFIG_SUNXI_FASTBOOT_GPIO @@ -420,7 +411,6 @@ extern int soft_i2c_gpio_scl; #endif #define CONFIG_MISC_INIT_R -#define CONFIG_SYS_CONSOLE_IS_IN_ENV #ifndef CONFIG_SPL_BUILD #include <config_distro_defaults.h> @@ -496,7 +486,7 @@ extern int soft_i2c_gpio_scl; #ifdef CONFIG_USB_FUNCTION_FASTBOOT #define BOOT_TARGET_DEVICES_FASTBOOT(func) func(FASTBOOT, fastboot, 0) #else -#defineBOOT_TARGET_DEVICES_FASTBOOT(func) +#define BOOT_TARGET_DEVICES_FASTBOOT(func) #endif /* FEL boot support, auto-execute boot.scr if a script address was provided */ |