[commit] r6537 - in trunk/src: arch/x86 boot cpu/amd/model_gx2 cpu/amd/model_lx southbridge/amd/rs780

[repository service]

Author: stepan
Date: Thu Apr 21 23:26:58 2011
New Revision: 6537
URL: https://tracker.coreboot.org/trac/coreboot/changeset/6537

Log:
more ifdef -> if fixes.

Signed-off-by: Stefan Reinauer 
Acked-by: Stefan Reinauer

Modified:
   trunk/src/arch/x86/Kconfig
   trunk/src/boot/selfboot.c
   trunk/src/cpu/amd/model_gx2/syspreinit.c
   trunk/src/cpu/amd/model_lx/syspreinit.c
   trunk/src/southbridge/amd/rs780/early_setup.c

Modified: trunk/src/arch/x86/Kconfig
==============================================================================
--- trunk/src/arch/x86/Kconfig	Thu Apr 21 22:45:45 2011	(r6536)
+++ trunk/src/arch/x86/Kconfig	Thu Apr 21 23:26:58 2011	(r6537)
@@ -91,4 +91,12 @@
 config BOOTBLOCK_SOUTHBRIDGE_INIT
    string

+config BIG_ENDIAN
+	bool
+	default n
+
+config LITTLE_ENDIAN
+	bool
+	default !BIG_ENDIAN
+
 endmenu

Modified: trunk/src/boot/selfboot.c
==============================================================================
--- trunk/src/boot/selfboot.c	Thu Apr 21 22:45:45 2011	(r6536)
+++ trunk/src/boot/selfboot.c	Thu Apr 21 23:26:58 2011	(r6537)
@@ -30,7 +30,7 @@
 #include <cbfs.h>
 #include <lib.h>

-#ifndef CONFIG_BIG_ENDIAN
+#if !CONFIG_BIG_ENDIAN
 #define ntohl(x) ( ((x&0xff)<<24) | ((x&0xff00)<<8) | \
    	((x&0xff0000) >> 8) | ((x&0xff000000) >> 24) )
 #else
@@ -477,7 +477,7 @@
    					return 0;
    				break;
    			}
-#if CONFIG_COMPRESSED_PAYLOAD_NRV2B==1
+#if CONFIG_COMPRESSED_PAYLOAD_NRV2B
    			case CBFS_COMPRESS_NRV2B: {
    				printk(BIOS_DEBUG, "using NRV2B\n");
    				unsigned long unrv2b(u8 *src, u8 *dst, unsigned long *ilen_p);

Modified: trunk/src/cpu/amd/model_gx2/syspreinit.c
==============================================================================
--- trunk/src/cpu/amd/model_gx2/syspreinit.c	Thu Apr 21 22:45:45 2011	(r6536)
+++ trunk/src/cpu/amd/model_gx2/syspreinit.c	Thu Apr 21 23:26:58 2011	(r6537)
@@ -13,7 +13,7 @@
 void SystemPreInit(void)
 {
    /* they want a jump ... */
-#ifndef CONFIG_CACHE_AS_RAM
+#if !CONFIG_CACHE_AS_RAM
    __asm__ __volatile__("jmp .+2\ninvd\njmp .+2\n");
 #endif
    StartTimer1();

Modified: trunk/src/cpu/amd/model_lx/syspreinit.c
==============================================================================
--- trunk/src/cpu/amd/model_lx/syspreinit.c	Thu Apr 21 22:45:45 2011	(r6536)
+++ trunk/src/cpu/amd/model_lx/syspreinit.c	Thu Apr 21 23:26:58 2011	(r6537)
@@ -39,7 +39,7 @@
 {

/* they want a jump ... */
-#ifndef CONFIG_CACHE_AS_RAM
+#if !CONFIG_CACHE_AS_RAM
    __asm__ __volatile__("jmp .+2\ninvd\njmp .+2\n");
 #endif
    StartTimer1();

Modified: trunk/src/southbridge/amd/rs780/early_setup.c
==============================================================================
--- trunk/src/southbridge/amd/rs780/early_setup.c	Thu Apr 21 22:45:45 2011	(r6536)
+++ trunk/src/southbridge/amd/rs780/early_setup.c	Thu Apr 21 23:26:58 2011	(r6537)
@@ -17,10 +17,6 @@
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
  */

-#ifndef CONFIG_NORTHBRIDGE_AMD_AMDFAM10
-#define CONFIG_NORTHBRIDGE_AMD_AMDFAM10 0
-#endif
-
 #include "rev.h"

#define NBHTIU_INDEX		0x94 /* Note: It is different with RS690, whose HTIU index is 0xA8 */