minix/u-boot
1
0
Fork 0
mirror of https://github.com/Stichting-MINIX-Research-Foundation/u-boot.git synced 2025-09-10 04:26:19 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix CONFIG_440_GX define usage.

Browse Source
This commit is contained in:
Marian Balakowicz 2006-06-30 18:35:04 +02:00
parent 971a5dd11a
commit bba6837732
3 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
CHANGELOG
View File

@ -2,6 +2,8 @@
Changes since U-Boot 1.1.4: Changes since U-Boot 1.1.4:
====================================================================== ======================================================================
* Fix CONFIG_440_GX define usage.
* Remove autogenerated bmp_logo.h file. * Remove autogenerated bmp_logo.h file.
* VoiceBlue update: use new MTD flash partitioning methods, use more * VoiceBlue update: use new MTD flash partitioning methods, use more

2
cpu/ppc4xx/start.S
View File

@ -1468,7 +1468,7 @@ trap_init:
cmplw 0, r7, r8 cmplw 0, r7, r8
blt 4b blt 4b
#if !defined(CONFIG_440_GX) && !defined(CONFIG_440SPE) #if !defined(CONFIG_440GX) && !defined(CONFIG_440SPE)
addi r7,r0,0x1000 /* set ME bit (Machine Exceptions) */ addi r7,r0,0x1000 /* set ME bit (Machine Exceptions) */
oris r7,r7,0x0002 /* set CE bit (Critical Exceptions) */ oris r7,r7,0x0002 /* set CE bit (Critical Exceptions) */
mtmsr r7 /* change MSR */ mtmsr r7 /* change MSR */

9
include/ppc440.h
View File

@ -214,14 +214,14 @@
#define mem_dlycal 0x0084 /* delay line calibration register */ #define mem_dlycal 0x0084 /* delay line calibration register */
#define mem_eccesr 0x0098 /* ECC error status */ #define mem_eccesr 0x0098 /* ECC error status */
#ifdef CONFIG_440_GX #ifdef CONFIG_440GX
#define sdr_amp 0x0240 #define sdr_amp 0x0240
#define sdr_xpllc 0x01c1 #define sdr_xpllc 0x01c1
#define sdr_xplld 0x01c2 #define sdr_xplld 0x01c2
#define sdr_xcr 0x01c0 #define sdr_xcr 0x01c0
#define sdr_sdstp2 0x4001 #define sdr_sdstp2 0x4001
#define sdr_sdstp3 0x4003 #define sdr_sdstp3 0x4003
#endif /* CONFIG_440_GX */ #endif /* CONFIG_440GX */
#ifdef CONFIG_440SPE #ifdef CONFIG_440SPE
#undef sdr_sdstp2 #undef sdr_sdstp2
@ -759,9 +759,6 @@
#define SDRAM_BXCF_M_BE_ENABLE 0x00000001 /* Memory Bank Enable */ #define SDRAM_BXCF_M_BE_ENABLE 0x00000001 /* Memory Bank Enable */
#endif /* CONFIG_440SPE */ #endif /* CONFIG_440SPE */
#ifndef CONFIG_440_GX
#endif /* not CONFIG_440SPE */
/*----------------------------------------------------------------------------- /*-----------------------------------------------------------------------------
| External Bus Controller | External Bus Controller
+----------------------------------------------------------------------------*/ +----------------------------------------------------------------------------*/
@ -1626,7 +1623,7 @@
#define UICB0_ALL (UICB0_UIC0CI | UICB0_UIC0NCI | UICB0_UIC1CI | \ #define UICB0_ALL (UICB0_UIC0CI | UICB0_UIC0NCI | UICB0_UIC1CI | \
UICB0_UIC1NCI | UICB0_UIC2CI | UICB0_UIC2NCI) UICB0_UIC1NCI | UICB0_UIC2CI | UICB0_UIC2NCI)
#endif /* CONFIG_440_GX */ #endif /* CONFIG_440GX */
/*---------------------------------------------------------------------------+ /*---------------------------------------------------------------------------+
| Universal interrupt controller interrupts | Universal interrupt controller interrupts
+---------------------------------------------------------------------------*/ +---------------------------------------------------------------------------*/