diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2007-07-05 18:01:14 +0200 |
---|---|---|
committer | Sascha Hauer <sha@octopus.labnet.pengutronix.de> | 2007-07-05 18:01:14 +0200 |
commit | 51eb67650f5c546750f9414496160f993da02477 (patch) | |
tree | 97b10ad5d1f2a382daaae6e497e4693149eaf76d | |
parent | dcc0d7ebda59f463a76eaa338be5bab656039083 (diff) | |
download | barebox-51eb67650f5c546750f9414496160f993da02477.tar.gz barebox-51eb67650f5c546750f9414496160f993da02477.tar.xz |
svn_rev_018
need reg2 fix to compile these
-rw-r--r-- | board/mx1ads/mx1ads.c | 6 | ||||
-rw-r--r-- | cpu/arm920t/imx/generic.c | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/board/mx1ads/mx1ads.c b/board/mx1ads/mx1ads.c index 326007a960..d86f0798e5 100644 --- a/board/mx1ads/mx1ads.c +++ b/board/mx1ads/mx1ads.c @@ -92,9 +92,9 @@ int board_init (void) CS4U = 0x00000F00; /* Initialize CS4 for CS8900 ethernet */ CS4L = 0x00001501; - - GIUS (0) &= 0xFF3FFFFF; - GPR (0) &= 0xFF3FFFFF; +/* FIXME: Use reg2-fix for this */ +// GIUS (0) &= 0xFF3FFFFF; +// GPR (0) &= 0xFF3FFFFF; tmp = *(unsigned int *) (0x1500000C); tmp = *(unsigned int *) (0x1500000C); diff --git a/cpu/arm920t/imx/generic.c b/cpu/arm920t/imx/generic.c index aa7c8c159d..f4d05ec4aa 100644 --- a/cpu/arm920t/imx/generic.c +++ b/cpu/arm920t/imx/generic.c @@ -35,7 +35,7 @@ void imx_gpio_mode(int gpio_mode) unsigned int port = (gpio_mode & GPIO_PORT_MASK) >> 5; unsigned int ocr = (gpio_mode & GPIO_OCR_MASK) >> 10; unsigned int tmp; - +#if 0 /* Pullup enable */ if(gpio_mode & GPIO_PUEN) PUEN(port) |= (1<<pin); @@ -85,6 +85,7 @@ void imx_gpio_mode(int gpio_mode) if( gpio_mode & GPIO_BOUT ) ICONFB2(port) &= ~( 3<<((pin-16)*2)); } +#endif } #endif /* CONFIG_IMX */ |