checkpatch.pl: Request if() instead #ifdef

[oweals/u-boot.git] / include / configs / sun50i.h

diff --git a/include/configs/sun50i.h b/include/configs/sun50i.h
index 0fdb4c7b99cfd0a231d4160a36c33aec8391a1d7..e050a5299f3b98689938d1f5b71bc4c44fff9e0d 100644 (file)
--- a/include/configs/sun50i.h
+++ b/include/configs/sun50i.h
@@ -1,7 +1,6 @@
+/* SPDX-License-Identifier: GPL-2.0+ */
 /*
  * Configuration settings for the Allwinner A64 (sun50i) CPU
- *
- * SPDX-License-Identifier:    GPL-2.0+
  */
 
 #ifndef __CONFIG_H
@@ -11,11 +10,13 @@
  * A64 specific configuration
  */
 
-#define CONFIG_SUNXI_USB_PHYS  1
-
-#define COUNTER_FREQUENCY      CONFIG_TIMER_CLK_FREQ
+#ifndef CONFIG_MACH_SUN50I_H6
 #define GICD_BASE              0x1c81000
 #define GICC_BASE              0x1c82000
+#else
+#define GICD_BASE              0x3021000
+#define GICC_BASE              0x3022000
+#endif
 
 /*
  * Include common sunxi configuration where most the settings are