ARMv7: Drop u-boot type remains

Just a mechanical cleanup.

Change-Id: I0815625e629ab0b7ae6c948144085f1bd8cabfb5
Signed-off-by: Stefan Reinauer <reinauer@google.com>
Reviewed-on: http://review.coreboot.org/2408
Reviewed-by: Ronald G. Minnich <rminnich@gmail.com>
Tested-by: build bot (Jenkins)

3 files changed, 12 insertions, 12 deletions

diff --git a/src/cpu/samsung/exynos5-common/i2c.c b/src/cpu/samsung/exynos5-common/i2c.c
index 624d48b7dd..7384b506df 100644
--- a/src/cpu/samsung/exynos5-common/i2c.c
+++ b/src/cpu/samsung/exynos5-common/i2c.c
@@ -148,7 +148,7 @@ static void ReadWriteByte(struct s3c24x0_i2c *i2c)
 
 static void i2c_ch_init(struct s3c24x0_i2c *i2c, int speed, int slaveadd)
 {
-	ulong freq, pres = 16, div;
+	unsigned long freq, pres = 16, div;
 
 	freq = clock_get_periph_rate(PERIPH_ID_I2C0);
 	/* calculate prescaler and divisor values */
@@ -207,7 +207,7 @@ void board_i2c_init(const void *blob)
 	int i;
 
 	for (i = 0; i < EXYNOS_I2C_MAX_CONTROLLERS; i++) {
-		uintptr_t reg_addr = samsung_get_base_i2c() +
+		unsigned intptr_t reg_addr = samsung_get_base_i2c() +
 			EXYNOS_I2C_SPACING * i;
 
 		i2c_bus[i].regs = (struct s3c24x0_i2c_bus *)reg_addr;
@@ -262,7 +262,7 @@ int i2c_get_bus_num_fdt(const void *blob, int node)
 
 	reg = fdtdec_get_addr(blob, node, "reg");
 	for (i = 0; i < i2c_busses; i++)
-		if (reg == (fdt_addr_t)(uintptr_t)i2c_bus[i].regs)
+		if (reg == (fdt_addr_t)(unsigned intptr_t)i2c_bus[i].regs)
 			return i;
 
 	debug("%s: Can't find any matched I2C bus\n", __func__);
@@ -501,10 +501,10 @@ static int i2c_transfer(struct s3c24x0_i2c *i2c,
 	return (result == I2C_OK) ? stop_bit_result : result;
 }
 
-int i2c_probe(uchar chip)
+int i2c_probe(unsigned char chip)
 {
 	struct s3c24x0_i2c_bus *i2c;
-	uchar buf[1];
+	unsigned char buf[1];
 	int ret;
 
 	i2c = get_bus(g_current_bus);
@@ -522,10 +522,10 @@ int i2c_probe(uchar chip)
 	return ret != I2C_OK;
 }
 
-int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
+int i2c_read(unsigned char chip, unsigned int addr, int alen, unsigned char *buffer, int len)
 {
 	struct s3c24x0_i2c_bus *i2c;
-	uchar xaddr[4];
+	unsigned char xaddr[4];
 	int ret;
 
 	if (alen > 4) {
@@ -568,10 +568,10 @@ int i2c_read(uchar chip, uint addr, int alen, uchar *buffer, int len)
 	return 0;
 }
 
-int i2c_write(uchar chip, uint addr, int alen, uchar *buffer, int len)
+int i2c_write(unsigned char chip, unsigned int addr, int alen, unsigned char *buffer, int len)
 {
 	struct s3c24x0_i2c_bus *i2c;
-	uchar xaddr[4];
+	unsigned char xaddr[4];
 	int ret;
 
 	if (alen > 4) {
diff --git a/src/cpu/samsung/exynos5-common/spi.c b/src/cpu/samsung/exynos5-common/spi.c
index 81927370e6..33f4d99fd2 100644
--- a/src/cpu/samsung/exynos5-common/spi.c
+++ b/src/cpu/samsung/exynos5-common/spi.c
@@ -44,8 +44,8 @@ static void exynos_spi_rx_tx(struct exynos_spi *regs, int todo,
 			     void *dinp, void const *doutp, int i)
 {
 	int rx_lvl, tx_lvl;
-	uint *rxp = (uint *)(dinp + (i * (32 * 1024)));
-	uint out_bytes, in_bytes;
+	unsigned int *rxp = (unsigned int *)(dinp + (i * (32 * 1024)));
+	unsigned int out_bytes, in_bytes;
 
 	// TODO In currrent implementation, every read/write must be aligned to
 	// 4 bytes, otherwise you may get timeout or other unexpected results.
diff --git a/src/cpu/samsung/exynos5-common/timer.c b/src/cpu/samsung/exynos5-common/timer.c
index 7e918aac65..b47da557b6 100644
--- a/src/cpu/samsung/exynos5-common/timer.c
+++ b/src/cpu/samsung/exynos5-common/timer.c
@@ -83,7 +83,7 @@ int init_timer(void)
  */
 unsigned long get_timer(unsigned long base)
 {
-	ulong now = timer_get_us_down();
+	unsigned long now = timer_get_us_down();
 
 	/*
 	 * Increment the time by the amount elapsed since the last read.