Move some #define-s around from one #ifdef block to another to reduce the number of #ifdef blocks (note this causes no functional changes even though the conditions are not always exactly the same) and move generic #include statements to the top.
Signed-off-by: Hans de Goede hdegoede@redhat.com --- include/configs/sunxi-common.h | 21 ++++++--------------- 1 file changed, 6 insertions(+), 15 deletions(-)
diff --git a/include/configs/sunxi-common.h b/include/configs/sunxi-common.h index 1776609..915b597 100644 --- a/include/configs/sunxi-common.h +++ b/include/configs/sunxi-common.h @@ -13,6 +13,7 @@ #ifndef _SUNXI_COMMON_CONFIG_H #define _SUNXI_COMMON_CONFIG_H
+#include <asm/arch/cpu.h> #include <linux/stringify.h>
#ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT @@ -35,27 +36,15 @@ * High Level Configuration Options */ #define CONFIG_SUNXI /* sunxi family */ -#ifdef CONFIG_SPL_BUILD -#define CONFIG_SYS_THUMB_BUILD /* Thumbs mode to save space in SPL */ -#endif - -#include <asm/arch/cpu.h> /* get chip and board defs */ - -#if !defined(CONFIG_SPL_BUILD) && defined(CONFIG_DM_SERIAL) -# define CONFIG_DW_SERIAL -#endif - -/* - * Display CPU information - */ -#define CONFIG_DISPLAY_CPUINFO
/* Serial & console */ #define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550_SERIAL /* ns16550 reg in the low bits of cpu reg */ #define CONFIG_SYS_NS16550_CLK 24000000 -#ifndef CONFIG_DM_SERIAL +#ifdef CONFIG_DM_SERIAL +# define CONFIG_DW_SERIAL +#else # define CONFIG_SYS_NS16550_REG_SIZE -4 # define CONFIG_SYS_NS16550_COM1 SUNXI_UART0_BASE # define CONFIG_SYS_NS16550_COM2 SUNXI_UART1_BASE @@ -65,6 +54,7 @@ #endif
/* CPU */ +#define CONFIG_DISPLAY_CPUINFO #define CONFIG_SYS_CACHELINE_SIZE 64
/* @@ -96,6 +86,7 @@ #define CONFIG_SPL_MALLOC_F_LEN 0x00080000 /* 512 KiB */
#ifdef CONFIG_SPL_BUILD +#define CONFIG_SYS_THUMB_BUILD /* Thumbs mode to save space in SPL */ #define CONFIG_SYS_MALLOC_SIMPLE /* Use malloc_simple to save space */ #undef CONFIG_SYS_MALLOC_F_LEN #define CONFIG_SYS_MALLOC_F_LEN CONFIG_SPL_MALLOC_F_LEN