Mirrors/u-boot
2
0
Fork 0
mirror of https://github.com/AsahiLinux/u-boot synced 2024-11-30 00:21:06 +00:00
Code Issues Projects Releases Packages Wiki Activity

sunxi: sunxi-common.h cleanup

Browse source 
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>
Acked-by: Ian Campbell <ijc@hellion.org.uk>
This commit is contained in:
Hans de Goede 2015-09-13 17:29:33 +02:00
parent 861ba4aaac
commit daf6d399ae
1 changed files with 5 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
include/configs/sunxi-common.h
View file

@ -13,6 +13,7 @@
#ifndef _SUNXI_COMMON_CONFIG_H #ifndef _SUNXI_COMMON_CONFIG_H
#define _SUNXI_COMMON_CONFIG_H #define _SUNXI_COMMON_CONFIG_H
#include <asm/arch/cpu.h>
#include <linux/stringify.h> #include <linux/stringify.h>
#ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT #ifdef CONFIG_OLD_SUNXI_KERNEL_COMPAT
@ -39,23 +40,14 @@
#define CONFIG_SYS_THUMB_BUILD /* Thumbs mode to save space in SPL */ #define CONFIG_SYS_THUMB_BUILD /* Thumbs mode to save space in SPL */
#endif #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 */ /* Serial & console */
#define CONFIG_SYS_NS16550 #define CONFIG_SYS_NS16550
#define CONFIG_SYS_NS16550_SERIAL #define CONFIG_SYS_NS16550_SERIAL
/* ns16550 reg in the low bits of cpu reg */ /* ns16550 reg in the low bits of cpu reg */
#define CONFIG_SYS_NS16550_CLK 24000000 #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_REG_SIZE -4
# define CONFIG_SYS_NS16550_COM1 SUNXI_UART0_BASE # define CONFIG_SYS_NS16550_COM1 SUNXI_UART0_BASE
# define CONFIG_SYS_NS16550_COM2 SUNXI_UART1_BASE # define CONFIG_SYS_NS16550_COM2 SUNXI_UART1_BASE
@ -65,6 +57,7 @@
#endif #endif
/* CPU */ /* CPU */
#define CONFIG_DISPLAY_CPUINFO
#define CONFIG_SYS_CACHELINE_SIZE 64 #define CONFIG_SYS_CACHELINE_SIZE 64
/* /*