From: Piotr Dymacz <pepe2k@gmail.com>
Date: Sun, 15 Nov 2015 16:07:00 +0000 (+0100)
Subject: Fix wrong bitwise operators used for SOC_TYPE defines
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=527bba0eaba3864a5f6dd62867ec1c92b2bd4d52;p=oweals%2Fu-boot_mod.git

Fix wrong bitwise operators used for SOC_TYPE defines
---

diff --git a/u-boot/Makefile b/u-boot/Makefile
index eabd143..e3104db 100644
--- a/u-boot/Makefile
+++ b/u-boot/Makefile
@@ -288,24 +288,24 @@ common_config :
 	@echo "/* AR933x */"                         >> include/config.h
 	@echo "#define QCA_AR9330_SOC		0x00001" >> include/config.h
 	@echo "#define QCA_AR9331_SOC		0x00002" >> include/config.h
-	@echo "#define QCA_AR933X_SOC		(QCA_AR9330_SOC || QCA_AR9331_SOC)" >> include/config.h
+	@echo "#define QCA_AR933X_SOC		(QCA_AR9330_SOC | QCA_AR9331_SOC)" >> include/config.h
 	@echo "/* AR934x */"                         >> include/config.h
 	@echo "#define QCA_AR9341_SOC		0x00010" >> include/config.h
 	@echo "#define QCA_AR9342_SOC		0x00020" >> include/config.h
 	@echo "#define QCA_AR9344_SOC		0x00040" >> include/config.h
-	@echo "#define QCA_AR934X_SOC		(QCA_AR9341_SOC || QCA_AR9342_SOC || QCA_AR9344_SOC)" >> include/config.h
+	@echo "#define QCA_AR934X_SOC		(QCA_AR9341_SOC | QCA_AR9342_SOC | QCA_AR9344_SOC)" >> include/config.h
 	@echo "/* QCA953x */"                        >> include/config.h
 	@echo "#define QCA_QCA9531_SOC		0x00100" >> include/config.h
 	@echo "#define QCA_QCA9533_SOC		0x00200" >> include/config.h
-	@echo "#define QCA_QCA953X_SOC		(QCA_QCA9531_SOC || QCA_QCA9533_SOC)" >> include/config.h
+	@echo "#define QCA_QCA953X_SOC		(QCA_QCA9531_SOC | QCA_QCA9533_SOC)" >> include/config.h
 	@echo "/* QCA956x */"                        >> include/config.h
 	@echo "#define QCA_QCA9561_SOC		0x01000" >> include/config.h
 	@echo "#define QCA_QCA9563_SOC		0x02000" >> include/config.h
-	@echo "#define QCA_QCA956X_SOC		(QCA_QCA9561_SOC || QCA_QCA9563_SOC)" >> include/config.h
+	@echo "#define QCA_QCA956X_SOC		(QCA_QCA9561_SOC | QCA_QCA9563_SOC)" >> include/config.h
 	@echo "/* QCA955x */"                        >> include/config.h
 	@echo "#define QCA_QCA9557_SOC		0x10000" >> include/config.h
 	@echo "#define QCA_QCA9558_SOC		0x20000" >> include/config.h
-	@echo "#define QCA_QCA955X_SOC		(QCA_QCA9557_SOC || QCA_QCA9558_SOC)" >> include/config.h
+	@echo "#define QCA_QCA955X_SOC		(QCA_QCA9557_SOC | QCA_QCA9558_SOC)" >> include/config.h
 	@echo ""                                     >> include/config.h
 
 ifdef CONFIG_BOOTDELAY
diff --git a/u-boot/include/soc/qca_soc_common.h b/u-boot/include/soc/qca_soc_common.h
index 10f870d..c9636ef 100644
--- a/u-boot/include/soc/qca_soc_common.h
+++ b/u-boot/include/soc/qca_soc_common.h
@@ -43,7 +43,7 @@
 
 #if (SOC_TYPE & QCA_AR933X_SOC)
 	#define QCA_SLIC_BASE_REG		QCA_APB_BASE_REG + 0x00090000
-#elif (SOC_TYPE & QCA_AR934X_SOC) || \
+#elif (SOC_TYPE & QCA_AR934X_SOC) | \
 	  (SOC_TYPE & QCA_AR955X_SOC)
 	#define QCA_SLIC_BASE_REG		QCA_APB_BASE_REG + 0x000A9000
 #endif
@@ -900,7 +900,7 @@
 #define QCA_RST_RESET_EXT_RST_SHIFT						28
 #define QCA_RST_RESET_EXT_RST_MASK						(1 << QCA_RST_RESET_EXT_RST_SHIFT)
 
-#if (SOC_TYPE & QCA_AR934X_SOC) || \
+#if (SOC_TYPE & QCA_AR934X_SOC) | \
 	(SOC_TYPE & QCA_QCA955X_SOC)
 	#define QCA_RST_RESET_HOST_DMA_RST_SHIFT			29
 	#define QCA_RST_RESET_HOST_DMA_RST_MASK				(1 << QCA_RST_RESET_HOST_DMA_RST_SHIFT)