Skip to content
Snippets Groups Projects
Commit cb2eb17b authored by Wolfgang Denk's avatar Wolfgang Denk Committed by Wolfgang Denk
Browse files

Merge with /home/tur/proj/v38b/u-boot

parents 91650b3e ce3f1a40
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 2 additions and 2 deletions
include/configs/v38b.h
+ 2
− 2
View file @ cb2eb17b
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#define CONFIG_RTC_PCF8563 1 /* has PCF8563 RTC */ #define CONFIG_RTC_PCF8563 1 /* has PCF8563 RTC */
#define CONFIG_MPC5200_DDR 1 /* has DDR SDRAM */ #define CONFIG_MPC5200_DDR 1 /* has DDR SDRAM */
#define CONFIG_HW_WATCHDOG 1 /* has watchdog */ #undef CONFIG_HW_WATCHDOG /* don't use watchdog */
#define CONFIG_NETCONSOLE 1 #define CONFIG_NETCONSOLE 1
...@@ -246,7 +246,7 @@ ...@@ -246,7 +246,7 @@
/* /*
* GPIO configuration * GPIO configuration
*/ */
#define CFG_GPS_PORT_CONFIG 0x90000404 #define CFG_GPS_PORT_CONFIG 0x90001404
/* /*
* Miscellaneous configurable options * Miscellaneous configurable options
......
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment