diff options
author | Wolfgang Denk <wd@denx.de> | 2006-10-29 01:12:53 +0200 |
---|---|---|
committer | Wolfgang Denk <wd@denx.de> | 2006-10-29 01:12:53 +0200 |
commit | d9831893ab2efd3dd36f948da898c83f33c4992c (patch) | |
tree | 9456126b6bf9d0664bc3f55057e603615cab728e /cpu | |
parent | 1954be6e9c9421b45d0a9d05b10356acc7563150 (diff) | |
parent | fae684e89844856383bdf101440889557df3e6b1 (diff) | |
download | u-boot-imx-d9831893ab2efd3dd36f948da898c83f33c4992c.zip u-boot-imx-d9831893ab2efd3dd36f948da898c83f33c4992c.tar.gz u-boot-imx-d9831893ab2efd3dd36f948da898c83f33c4992c.tar.bz2 |
Merge with /home/sr/git/u-boot/nand-ladis
Diffstat (limited to 'cpu')
-rw-r--r-- | cpu/arm925t/omap925.c | 34 |
1 files changed, 0 insertions, 34 deletions
diff --git a/cpu/arm925t/omap925.c b/cpu/arm925t/omap925.c index ae62656..65dab9f 100644 --- a/cpu/arm925t/omap925.c +++ b/cpu/arm925t/omap925.c @@ -25,40 +25,6 @@ #include <command.h> #include <arm925t.h> -ushort gpioreserved; - -void gpioreserve(ushort mask) -{ - gpioreserved |= mask; -} - -void gpiosetdir(ushort mask, ushort in) -{ - *(ushort *)GPIO_DIR_CONTROL_REG = (*(ushort *)GPIO_DIR_CONTROL_REG & ~mask) | (in & mask); -} - - -void gpiosetout(ushort mask, ushort out) -{ - ushort *r_ptr, r_val; - - r_ptr = (ushort *)GPIO_DATA_OUTPUT_REG; /* set pointer */ - r_val = *r_ptr & ~mask; /* get previous val, clear bits we want to change */ - r_val |= (out & mask); /* set specified bits in value + plus origional ones */ - *r_ptr = r_val; /* write it out */ -/* - * gcc screwed this one up :(. - * - * *(ushort *)GPIO_DATA_OUTPUT_REG = (*(ushort *)GPIO_DATA_OUTPUT_REG & ~mask) | (out & mask); - */ - -} - -void gpioinit(void) -{ -} - - #define MIF_CONFIG_REG 0xFFFECC0C #define FLASH_GLOBAL_CTRL_NWP 1 |