src/mainboard: change "unsigned" to "unsigned int"

Signed-off-by: Martin Roth <martin@coreboot.org>
Change-Id: I46d131f76ec930d2ef0f74e6eaabae067df10754
Reviewed-on: https://review.coreboot.org/c/coreboot/+/36330
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Patrick Rudolph <siro@das-labor.org>

58 files changed, 97 insertions, 97 deletions

diff --git a/src/mainboard/amd/bettong/mptable.c b/src/mainboard/amd/bettong/mptable.c
index 40dec74d93..af943f1212 100644
--- a/src/mainboard/amd/bettong/mptable.c
+++ b/src/mainboard/amd/bettong/mptable.c
@@ -22,7 +22,7 @@
 #include <southbridge/amd/pi/hudson/hudson.h>
 #include <southbridge/amd/common/amd_pci_util.h>
 
-static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned length)
+static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length)
 {
 	mc->mpc_length += length;
 	mc->mpc_entry_count++;
diff --git a/src/mainboard/amd/olivehill/mptable.c b/src/mainboard/amd/olivehill/mptable.c
index c87749e2d4..75d026e00a 100644
--- a/src/mainboard/amd/olivehill/mptable.c
+++ b/src/mainboard/amd/olivehill/mptable.c
@@ -39,7 +39,7 @@ u8 intr_data[0x54] = {
 	0x10,0x11,0x12,0x13
 };
 
-static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned length)
+static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length)
 {
 	mc->mpc_length += length;
 	mc->mpc_entry_count++;
diff --git a/src/mainboard/amd/olivehillplus/mptable.c b/src/mainboard/amd/olivehillplus/mptable.c
index cc5fa304a2..b04f5acb81 100644
--- a/src/mainboard/amd/olivehillplus/mptable.c
+++ b/src/mainboard/amd/olivehillplus/mptable.c
@@ -39,7 +39,7 @@ u8 intr_data[0x54] = {
 	0x10,0x11,0x12,0x13
 };
 
-static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned length)
+static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length)
 {
 	mc->mpc_length += length;
 	mc->mpc_entry_count++;
diff --git a/src/mainboard/amd/parmer/mptable.c b/src/mainboard/amd/parmer/mptable.c
index a7d47c2cdd..ea1862495c 100644
--- a/src/mainboard/amd/parmer/mptable.c
+++ b/src/mainboard/amd/parmer/mptable.c
@@ -39,7 +39,7 @@ u8 intr_data[0x54] = {
 	0x10,0x11,0x12,0x13
 };
 
-static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned length)
+static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length)
 {
 	mc->mpc_length += length;
 	mc->mpc_entry_count++;
diff --git a/src/mainboard/amd/thatcher/mptable.c b/src/mainboard/amd/thatcher/mptable.c
index 403a282d55..f7698bb16f 100644
--- a/src/mainboard/amd/thatcher/mptable.c
+++ b/src/mainboard/amd/thatcher/mptable.c
@@ -39,7 +39,7 @@ u8 intr_data[0x54] = {
 	0x10,0x11,0x12,0x13
 };
 
-static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned length)
+static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length)
 {
 	mc->mpc_length += length;
 	mc->mpc_entry_count++;
diff --git a/src/mainboard/amd/torpedo/mptable.c b/src/mainboard/amd/torpedo/mptable.c
index 743651e1f0..811154379f 100644
--- a/src/mainboard/amd/torpedo/mptable.c
+++ b/src/mainboard/amd/torpedo/mptable.c
@@ -43,7 +43,7 @@ u8 intr_data[] = {
 	0x10,0x11,0x12,0x13
 };
 
-static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned length)
+static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length)
 {
 	mc->mpc_length += length;
 	mc->mpc_entry_count++;
@@ -64,9 +64,9 @@ static void *smp_write_config_table(void *v)
 	struct mp_config_table *mc;
 	int bus_isa;
 	int boot_apic_id;
-	unsigned apic_version;
-	unsigned cpu_features;
-	unsigned cpu_feature_flags;
+	unsigned int apic_version;
+	unsigned int cpu_features;
+	unsigned int cpu_feature_flags;
 	struct cpuid_result result;
 	unsigned long cpu_flag;
 
diff --git a/src/mainboard/asrock/imb-a180/mptable.c b/src/mainboard/asrock/imb-a180/mptable.c
index b64198092e..a3c8e517bb 100644
--- a/src/mainboard/asrock/imb-a180/mptable.c
+++ b/src/mainboard/asrock/imb-a180/mptable.c
@@ -40,7 +40,7 @@ u8 intr_data[0x54] = {
 	0x10,0x11,0x12,0x13
 };
 
-static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned length)
+static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length)
 {
 	mc->mpc_length += length;
 	mc->mpc_entry_count++;
diff --git a/src/mainboard/asus/f2a85-m/mptable.c b/src/mainboard/asus/f2a85-m/mptable.c
index 0811fd2e1c..8bfe4d535a 100644
--- a/src/mainboard/asus/f2a85-m/mptable.c
+++ b/src/mainboard/asus/f2a85-m/mptable.c
@@ -39,7 +39,7 @@ u8 intr_data[0x54] = {
 	0x10,0x11,0x12,0x13
 };
 
-static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned length)
+static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length)
 {
 	mc->mpc_length += length;
 	mc->mpc_entry_count++;
diff --git a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
index dd7ebc962c..62f1af6ac2 100644
--- a/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
+++ b/src/mainboard/asus/kfsn4-dre/get_bus_conf.c
@@ -32,11 +32,11 @@
  */
 /* busnum is default */
 unsigned char bus_ck804[6];
-unsigned apicid_ck804;
+unsigned int apicid_ck804;
 
 void get_bus_conf(void)
 {
-	unsigned apicid_base, sbdn;
+	unsigned int apicid_base, sbdn;
 	struct device *dev;
 	int i;
 
diff --git a/src/mainboard/asus/kfsn4-dre/irq_tables.c b/src/mainboard/asus/kfsn4-dre/irq_tables.c
index c1bd3058ab..3fa72d732c 100644
--- a/src/mainboard/asus/kfsn4-dre/irq_tables.c
+++ b/src/mainboard/asus/kfsn4-dre/irq_tables.c
@@ -64,7 +64,7 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 {
 	struct irq_routing_table *pirq;
 	struct irq_info *pirq_info;
-	unsigned slot_num, sbdn;
+	unsigned int slot_num, sbdn;
 	uint8_t *v, sum = 0;
 	int i;
 
diff --git a/src/mainboard/asus/kfsn4-dre/mptable.c b/src/mainboard/asus/kfsn4-dre/mptable.c
index 10a379844d..7ceb72062a 100644
--- a/src/mainboard/asus/kfsn4-dre/mptable.c
+++ b/src/mainboard/asus/kfsn4-dre/mptable.c
@@ -29,12 +29,12 @@
 #include <cpu/amd/amdfam10_sysconf.h>
 
 extern unsigned char bus_ck804[6];
-extern unsigned apicid_ck804;
+extern unsigned int apicid_ck804;
 
 static void *smp_write_config_table(void *v)
 {
 	struct mp_config_table *mc;
-	unsigned sbdn;
+	unsigned int sbdn;
 	int bus_isa;
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
diff --git a/src/mainboard/asus/kfsn4-dre/romstage.c b/src/mainboard/asus/kfsn4-dre/romstage.c
index 22eb1157b9..7d710d73a2 100644
--- a/src/mainboard/asus/kfsn4-dre/romstage.c
+++ b/src/mainboard/asus/kfsn4-dre/romstage.c
@@ -65,7 +65,7 @@ int spd_read_byte(unsigned int device, unsigned int address)
  * @param[in] bus target bus number
  * @return southbridge device number
  */
-unsigned int get_sbdn(unsigned bus)
+unsigned int get_sbdn(unsigned int bus)
 {
 	pci_devfn_t dev;
 
@@ -114,7 +114,7 @@ static const unsigned int ctrl_conf_enable_msi_mapping[] = {
 static void ck804_control(const unsigned int *values, u32 size,
 			  uint8_t bus_unit_id)
 {
-	unsigned busn[4], io_base[4];
+	unsigned int busn[4], io_base[4];
 	int i, ck804_num = 0;
 
 	for (i = 0; i < 4; i++) {
diff --git a/src/mainboard/bap/ode_e21XX/mptable.c b/src/mainboard/bap/ode_e21XX/mptable.c
index cc5fa304a2..b04f5acb81 100644
--- a/src/mainboard/bap/ode_e21XX/mptable.c
+++ b/src/mainboard/bap/ode_e21XX/mptable.c
@@ -39,7 +39,7 @@ u8 intr_data[0x54] = {
 	0x10,0x11,0x12,0x13
 };
 
-static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned length)
+static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length)
 {
 	mc->mpc_length += length;
 	mc->mpc_entry_count++;
diff --git a/src/mainboard/biostar/a68n_5200/mptable.c b/src/mainboard/biostar/a68n_5200/mptable.c
index c87749e2d4..75d026e00a 100644
--- a/src/mainboard/biostar/a68n_5200/mptable.c
+++ b/src/mainboard/biostar/a68n_5200/mptable.c
@@ -39,7 +39,7 @@ u8 intr_data[0x54] = {
 	0x10,0x11,0x12,0x13
 };
 
-static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned length)
+static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length)
 {
 	mc->mpc_length += length;
 	mc->mpc_entry_count++;
diff --git a/src/mainboard/google/daisy/mainboard.c b/src/mainboard/google/daisy/mainboard.c
index 46939b70e9..30f8805c41 100644
--- a/src/mainboard/google/daisy/mainboard.c
+++ b/src/mainboard/google/daisy/mainboard.c
@@ -330,9 +330,9 @@ static void mainboard_enable(struct device *dev)
 	mmu_config_range(DRAM_END, 4096 - DRAM_END, DCACHE_OFF);
 	dcache_mmu_enable();
 
-	const unsigned epll_hz = 192000000;
-	const unsigned sample_rate = 48000;
-	const unsigned lr_frame_size = 256;
+	const unsigned int epll_hz = 192000000;
+	const unsigned int sample_rate = 48000;
+	const unsigned int lr_frame_size = 256;
 	clock_epll_set_rate(epll_hz);
 	clock_select_i2s_clk_source();
 	clock_set_i2s_clk_prescaler(epll_hz, sample_rate * lr_frame_size);
diff --git a/src/mainboard/google/foster/pmic.c b/src/mainboard/google/foster/pmic.c
index 13e2a4743f..6435317a22 100644
--- a/src/mainboard/google/foster/pmic.c
+++ b/src/mainboard/google/foster/pmic.c
@@ -34,7 +34,7 @@ struct max77620_init_reg {
 	u8 delay;
 };
 
-static void pmic_write_reg(unsigned bus, uint8_t reg, uint8_t val, int delay)
+static void pmic_write_reg(unsigned int bus, uint8_t reg, uint8_t val, int delay)
 {
 	if (i2c_writeb(bus, MAX77620_I2C_ADDR, reg, val)) {
 		printk(BIOS_ERR, "%s: reg = 0x%02X, value = 0x%02X failed!\n",
@@ -47,7 +47,7 @@ static void pmic_write_reg(unsigned bus, uint8_t reg, uint8_t val, int delay)
 	}
 }
 
-void pmic_init(unsigned bus)
+void pmic_init(unsigned int bus)
 {
 	/* Setup/Enable GPIO5 - VDD_CPU_REG_EN */
 	pmic_write_reg(bus, MAX77620_GPIO5_REG, 0x09, 1);
diff --git a/src/mainboard/google/foster/pmic.h b/src/mainboard/google/foster/pmic.h
index 13ca1ee600..b4735bde95 100644
--- a/src/mainboard/google/foster/pmic.h
+++ b/src/mainboard/google/foster/pmic.h
@@ -65,6 +65,6 @@
 #define MAX77620_CID4_REG		0x5C
 #define MAX77620_CID5_REG		0x5D
 
-void pmic_init(unsigned bus);
+void pmic_init(unsigned int bus);
 
 #endif /* __MAINBOARD_GOOGLE_FOSTER_PMIC_H__ */
diff --git a/src/mainboard/google/gale/cdp.c b/src/mainboard/google/gale/cdp.c
index 11a0f687eb..2b1d145d86 100644
--- a/src/mainboard/google/gale/cdp.c
+++ b/src/mainboard/google/gale/cdp.c
@@ -20,7 +20,7 @@
 #include <types.h>
 #include <boardid.h>
 
-void ipq_configure_gpio(const gpio_func_data_t *gpio, unsigned count)
+void ipq_configure_gpio(const gpio_func_data_t *gpio, unsigned int count)
 {
 	int i;
 
diff --git a/src/mainboard/google/nyan/pmic.c b/src/mainboard/google/nyan/pmic.c
index d2264591fd..893d2eace5 100644
--- a/src/mainboard/google/nyan/pmic.c
+++ b/src/mainboard/google/nyan/pmic.c
@@ -55,7 +55,7 @@ static struct as3722_init_reg init_list[] = {
 	{AS3722_LDO11, 0x00, 1},
 };
 
-static void pmic_write_reg(unsigned bus, uint8_t reg, uint8_t val, int do_delay)
+static void pmic_write_reg(unsigned int bus, uint8_t reg, uint8_t val, int do_delay)
 {
 		if (i2c_writeb(bus, AS3722_I2C_ADDR, reg, val)) {
 		printk(BIOS_ERR, "%s: reg = 0x%02X, value = 0x%02X failed!\n",
@@ -68,7 +68,7 @@ static void pmic_write_reg(unsigned bus, uint8_t reg, uint8_t val, int do_delay)
 	}
 }
 
-static void pmic_slam_defaults(unsigned bus)
+static void pmic_slam_defaults(unsigned int bus)
 {
 	int i;
 	for (i = 0; i < ARRAY_SIZE(init_list); i++) {
@@ -77,7 +77,7 @@ static void pmic_slam_defaults(unsigned bus)
 	}
 }
 
-void pmic_init(unsigned bus)
+void pmic_init(unsigned int bus)
 {
 	/*
 	 * Don't need to set up VDD_CORE - already done - by OTP
diff --git a/src/mainboard/google/nyan/pmic.h b/src/mainboard/google/nyan/pmic.h
index 9843b72156..639725e431 100644
--- a/src/mainboard/google/nyan/pmic.h
+++ b/src/mainboard/google/nyan/pmic.h
@@ -39,6 +39,6 @@ enum {
 	AS3722_LDO11,
 };
 
-void pmic_init(unsigned bus);
+void pmic_init(unsigned int bus);
 
 #endif /* __MAINBOARD_GOOGLE_NYAN_PMIC_H__ */
diff --git a/src/mainboard/google/nyan_big/pmic.c b/src/mainboard/google/nyan_big/pmic.c
index 948d867750..f70e6dd49f 100644
--- a/src/mainboard/google/nyan_big/pmic.c
+++ b/src/mainboard/google/nyan_big/pmic.c
@@ -55,7 +55,7 @@ static struct as3722_init_reg init_list[] = {
 	{AS3722_LDO11, 0x00, 1},
 };
 
-static void pmic_write_reg(unsigned bus, uint8_t reg, uint8_t val, int do_delay)
+static void pmic_write_reg(unsigned int bus, uint8_t reg, uint8_t val, int do_delay)
 {
 	if (i2c_writeb(bus, AS3722_I2C_ADDR, reg, val)) {
 		printk(BIOS_ERR, "%s: reg = 0x%02X, value = 0x%02X failed!\n",
@@ -68,7 +68,7 @@ static void pmic_write_reg(unsigned bus, uint8_t reg, uint8_t val, int do_delay)
 	}
 }
 
-static void pmic_slam_defaults(unsigned bus)
+static void pmic_slam_defaults(unsigned int bus)
 {
 	int i;
 
@@ -78,7 +78,7 @@ static void pmic_slam_defaults(unsigned bus)
 	}
 }
 
-void pmic_init(unsigned bus)
+void pmic_init(unsigned int bus)
 {
 	/*
 	 * Don't need to set up VDD_CORE - already done - by OTP
diff --git a/src/mainboard/google/nyan_big/pmic.h b/src/mainboard/google/nyan_big/pmic.h
index 65ee264145..e4fbb8d56c 100644
--- a/src/mainboard/google/nyan_big/pmic.h
+++ b/src/mainboard/google/nyan_big/pmic.h
@@ -39,6 +39,6 @@ enum {
 	AS3722_LDO11,
 };
 
-void pmic_init(unsigned bus);
+void pmic_init(unsigned int bus);
 
 #endif /* __MAINBOARD_GOOGLE_NYAN_BIG_PMIC_H__ */
diff --git a/src/mainboard/google/nyan_blaze/pmic.c b/src/mainboard/google/nyan_blaze/pmic.c
index 948d867750..f70e6dd49f 100644
--- a/src/mainboard/google/nyan_blaze/pmic.c
+++ b/src/mainboard/google/nyan_blaze/pmic.c
@@ -55,7 +55,7 @@ static struct as3722_init_reg init_list[] = {
 	{AS3722_LDO11, 0x00, 1},
 };
 
-static void pmic_write_reg(unsigned bus, uint8_t reg, uint8_t val, int do_delay)
+static void pmic_write_reg(unsigned int bus, uint8_t reg, uint8_t val, int do_delay)
 {
 	if (i2c_writeb(bus, AS3722_I2C_ADDR, reg, val)) {
 		printk(BIOS_ERR, "%s: reg = 0x%02X, value = 0x%02X failed!\n",
@@ -68,7 +68,7 @@ static void pmic_write_reg(unsigned bus, uint8_t reg, uint8_t val, int do_delay)
 	}
 }
 
-static void pmic_slam_defaults(unsigned bus)
+static void pmic_slam_defaults(unsigned int bus)
 {
 	int i;
 
@@ -78,7 +78,7 @@ static void pmic_slam_defaults(unsigned bus)
 	}
 }
 
-void pmic_init(unsigned bus)
+void pmic_init(unsigned int bus)
 {
 	/*
 	 * Don't need to set up VDD_CORE - already done - by OTP
diff --git a/src/mainboard/google/nyan_blaze/pmic.h b/src/mainboard/google/nyan_blaze/pmic.h
index a1213d9b2d..02b3e81a9c 100644
--- a/src/mainboard/google/nyan_blaze/pmic.h
+++ b/src/mainboard/google/nyan_blaze/pmic.h
@@ -39,6 +39,6 @@ enum {
 	AS3722_LDO11,
 };
 
-void pmic_init(unsigned bus);
+void pmic_init(unsigned int bus);
 
 #endif /* __MAINBOARD_GOOGLE_NYAN_BLAZE_PMIC_H__ */
diff --git a/src/mainboard/google/peach_pit/mainboard.c b/src/mainboard/google/peach_pit/mainboard.c
index ecd2260511..234a433acb 100644
--- a/src/mainboard/google/peach_pit/mainboard.c
+++ b/src/mainboard/google/peach_pit/mainboard.c
@@ -465,9 +465,9 @@ static void mainboard_enable(struct device *dev)
 	mmu_config_range((uintptr_t)_dma_coherent/MiB,
 			 REGION_SIZE(dma_coherent)/MiB, DCACHE_OFF);
 
-	const unsigned epll_hz = 192000000;
-	const unsigned sample_rate = 48000;
-	const unsigned lr_frame_size = 256;
+	const unsigned int epll_hz = 192000000;
+	const unsigned int sample_rate = 48000;
+	const unsigned int lr_frame_size = 256;
 	clock_epll_set_rate(epll_hz);
 	clock_select_i2s_clk_source();
 	clock_set_i2s_clk_prescaler(epll_hz, sample_rate * lr_frame_size);
diff --git a/src/mainboard/google/smaug/pmic.c b/src/mainboard/google/smaug/pmic.c
index 9add211ccd..68e0f6ccd3 100644
--- a/src/mainboard/google/smaug/pmic.c
+++ b/src/mainboard/google/smaug/pmic.c
@@ -36,7 +36,7 @@ struct max77620_init_reg {
 	u8 delay;
 };
 
-static void pmic_write_reg(unsigned bus, uint8_t chip, uint8_t reg, uint8_t val,
+static void pmic_write_reg(unsigned int bus, uint8_t chip, uint8_t reg, uint8_t val,
 			   int delay)
 {
 	if (i2c_writeb(bus, chip, reg, val)) {
@@ -50,19 +50,19 @@ static void pmic_write_reg(unsigned bus, uint8_t chip, uint8_t reg, uint8_t val,
 	}
 }
 
-void pmic_write_reg_77620(unsigned bus, uint8_t reg, uint8_t val,
+void pmic_write_reg_77620(unsigned int bus, uint8_t reg, uint8_t val,
 					int delay)
 {
 	pmic_write_reg(bus, MAX77620_I2C_ADDR, reg, val, delay);
 }
 
-static inline void pmic_write_reg_77621(unsigned bus, uint8_t reg, uint8_t val,
+static inline void pmic_write_reg_77621(unsigned int bus, uint8_t reg, uint8_t val,
 					int delay)
 {
 	pmic_write_reg(bus, MAX77621_CPU_I2C_ADDR, reg, val, delay);
 }
 
-void pmic_init(unsigned bus)
+void pmic_init(unsigned int bus)
 {
 	/* MAX77620: Set SD0 to 1.0V - VDD_CORE */
 	pmic_write_reg_77620(bus, MAX77620_SD0_REG, 0x20, 1);
diff --git a/src/mainboard/google/smaug/pmic.h b/src/mainboard/google/smaug/pmic.h
index e01a556948..130f134d95 100644
--- a/src/mainboard/google/smaug/pmic.h
+++ b/src/mainboard/google/smaug/pmic.h
@@ -73,8 +73,8 @@
 #define MAX77621_CONTROL1_REG		0x02
 #define MAX77621_CONTROL2_REG		0x03
 
-void pmic_init(unsigned bus);
-void pmic_write_reg_77620(unsigned bus, uint8_t reg, uint8_t val,
+void pmic_init(unsigned int bus);
+void pmic_write_reg_77620(unsigned int bus, uint8_t reg, uint8_t val,
 					int delay);
 
 #endif /* __MAINBOARD_GOOGLE_FOSTER_PMIC_H__ */
diff --git a/src/mainboard/google/storm/cdp.c b/src/mainboard/google/storm/cdp.c
index 3c27491c50..f143bf9171 100644
--- a/src/mainboard/google/storm/cdp.c
+++ b/src/mainboard/google/storm/cdp.c
@@ -21,7 +21,7 @@
 #include <types.h>
 #include <boardid.h>
 
-void ipq_configure_gpio(const gpio_func_data_t *gpio, unsigned count)
+void ipq_configure_gpio(const gpio_func_data_t *gpio, unsigned int count)
 {
 	int i;
 
diff --git a/src/mainboard/hp/abm/mptable.c b/src/mainboard/hp/abm/mptable.c
index c87749e2d4..75d026e00a 100644
--- a/src/mainboard/hp/abm/mptable.c
+++ b/src/mainboard/hp/abm/mptable.c
@@ -39,7 +39,7 @@ u8 intr_data[0x54] = {
 	0x10,0x11,0x12,0x13
 };
 
-static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned length)
+static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length)
 {
 	mc->mpc_length += length;
 	mc->mpc_entry_count++;
diff --git a/src/mainboard/hp/dl165_g6_fam10/bootblock.c b/src/mainboard/hp/dl165_g6_fam10/bootblock.c
index 16908cf704..b70b0a3e24 100644
--- a/src/mainboard/hp/dl165_g6_fam10/bootblock.c
+++ b/src/mainboard/hp/dl165_g6_fam10/bootblock.c
@@ -18,13 +18,13 @@
 #define SCH4307_CONFIG_PORT     0x162e
 static inline void shc4307_enter_ext_func_mode(pnp_devfn_t dev)
 {
-	unsigned port = dev >> 8;
+	unsigned int port = dev >> 8;
 	outb(0x55, port);
 }
 
 static inline void shc4307_exit_ext_func_mode(pnp_devfn_t dev)
 {
-	unsigned port = dev >> 8;
+	unsigned int port = dev >> 8;
 	outb(0xaa, port);
 }
 
diff --git a/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c b/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
index e217aa7138..0d8ee8c28b 100644
--- a/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
+++ b/src/mainboard/hp/dl165_g6_fam10/get_bus_conf.c
@@ -33,7 +33,7 @@ struct mb_sysconf_t mb_sysconf;
 void get_bus_conf(void)
 {
 
-	unsigned apicid_base;
+	unsigned int apicid_base;
 
 	struct device *dev;
 	int i;
diff --git a/src/mainboard/hp/dl165_g6_fam10/mb_sysconf.h b/src/mainboard/hp/dl165_g6_fam10/mb_sysconf.h
index 8b0e580057..b2a11e33f2 100644
--- a/src/mainboard/hp/dl165_g6_fam10/mb_sysconf.h
+++ b/src/mainboard/hp/dl165_g6_fam10/mb_sysconf.h
@@ -29,9 +29,9 @@ struct mb_sysconf_t {
 	unsigned char bus_bcm5785_0;
 	unsigned char bus_bcm5785_1;
 	unsigned char bus_bcm5785_1_1;
-	unsigned apicid_bcm5785[3];
+	unsigned int apicid_bcm5785[3];
 
-	unsigned sbdn2;
+	unsigned int sbdn2;
 };
 
 #endif
diff --git a/src/mainboard/hp/pavilion_m6_1035dx/mptable.c b/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
index 08de04e4ca..0d44397be5 100644
--- a/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
+++ b/src/mainboard/hp/pavilion_m6_1035dx/mptable.c
@@ -39,7 +39,7 @@ u8 intr_data[0x54] = {
 	0x10,0x11,0x12,0x13
 };
 
-static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned length)
+static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length)
 {
 	mc->mpc_length += length;
 	mc->mpc_entry_count++;
diff --git a/src/mainboard/kontron/ktqm77/mainboard.c b/src/mainboard/kontron/ktqm77/mainboard.c
index ee83b1bcd4..50a7b6be08 100644
--- a/src/mainboard/kontron/ktqm77/mainboard.c
+++ b/src/mainboard/kontron/ktqm77/mainboard.c
@@ -165,7 +165,7 @@ static void mainboard_enable(struct device *dev)
 	mainboard_interrupt_handlers(0x15, &int15_handler);
 #endif
 
-	unsigned disable = 0;
+	unsigned int disable = 0;
 	if ((get_option(&disable, "ethernet1") == CB_SUCCESS) && disable) {
 		struct device *nic = pcidev_on_root(0x1c, 2);
 		if (nic) {
diff --git a/src/mainboard/lenovo/g505s/mptable.c b/src/mainboard/lenovo/g505s/mptable.c
index 08de04e4ca..0d44397be5 100644
--- a/src/mainboard/lenovo/g505s/mptable.c
+++ b/src/mainboard/lenovo/g505s/mptable.c
@@ -39,7 +39,7 @@ u8 intr_data[0x54] = {
 	0x10,0x11,0x12,0x13
 };
 
-static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned length)
+static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length)
 {
 	mc->mpc_length += length;
 	mc->mpc_entry_count++;
diff --git a/src/mainboard/msi/ms7721/mptable.c b/src/mainboard/msi/ms7721/mptable.c
index 0811fd2e1c..8bfe4d535a 100644
--- a/src/mainboard/msi/ms7721/mptable.c
+++ b/src/mainboard/msi/ms7721/mptable.c
@@ -39,7 +39,7 @@ u8 intr_data[0x54] = {
 	0x10,0x11,0x12,0x13
 };
 
-static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned length)
+static void smp_add_mpc_entry(struct mp_config_table *mc, unsigned int length)
 {
 	mc->mpc_length += length;
 	mc->mpc_entry_count++;
diff --git a/src/mainboard/msi/ms9652_fam10/acpi_tables.c b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
index c81798587f..9f230df518 100644
--- a/src/mainboard/msi/ms9652_fam10/acpi_tables.c
+++ b/src/mainboard/msi/ms9652_fam10/acpi_tables.c
@@ -34,7 +34,7 @@ unsigned long acpi_fill_madt(unsigned long current)
 	//extern unsigned char bus_mcp55[8];
 	//extern unsigned apicid_mcp55;
 
-	unsigned sbdn;
+	unsigned int sbdn;
 	struct resource *res;
 	struct device *dev;
 
diff --git a/src/mainboard/msi/ms9652_fam10/get_bus_conf.c b/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
index 74b14b42c8..d13a8130ed 100644
--- a/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
+++ b/src/mainboard/msi/ms9652_fam10/get_bus_conf.c
@@ -32,7 +32,7 @@ struct mb_sysconf_t mb_sysconf;
 
 void get_bus_conf(void)
 {
-	unsigned apicid_base;
+	unsigned int apicid_base;
 	struct mb_sysconf_t *m;
 
 	struct device *dev;
diff --git a/src/mainboard/msi/ms9652_fam10/irq_tables.c b/src/mainboard/msi/ms9652_fam10/irq_tables.c
index e33ceecbaa..69327dcafa 100644
--- a/src/mainboard/msi/ms9652_fam10/irq_tables.c
+++ b/src/mainboard/msi/ms9652_fam10/irq_tables.c
@@ -49,10 +49,10 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 
 	struct irq_routing_table *pirq;
 	struct irq_info *pirq_info;
-	unsigned slot_num;
+	unsigned int slot_num;
 	uint8_t *v;
 	struct mb_sysconf_t *m;
-	unsigned sbdn;
+	unsigned int sbdn;
 
 	uint8_t sum = 0;
 	int i;
@@ -96,8 +96,8 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	for (i = 1; i < sysconf.hc_possible_num; i++) {
 		if (!(sysconf.pci1234[i] & 0x1))
 			continue;
-		unsigned busn = (sysconf.pci1234[i] >> 12) & 0xff;
-		unsigned devn = sysconf.hcdn[i] & 0xff;
+		unsigned int busn = (sysconf.pci1234[i] >> 12) & 0xff;
+		unsigned int devn = sysconf.hcdn[i] & 0xff;
 
 		write_pirq_info(pirq_info, busn, PCI_DEVFN(devn, 0), 0x1, 0xdef8,
 				0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0);
diff --git a/src/mainboard/msi/ms9652_fam10/mb_sysconf.h b/src/mainboard/msi/ms9652_fam10/mb_sysconf.h
index ddd6cfe38f..1a287c6a8a 100644
--- a/src/mainboard/msi/ms9652_fam10/mb_sysconf.h
+++ b/src/mainboard/msi/ms9652_fam10/mb_sysconf.h
@@ -20,7 +20,7 @@
 
 struct mb_sysconf_t {
 	unsigned char bus_mcp55[8]; //1
-	unsigned apicid_mcp55;
+	unsigned int apicid_mcp55;
 };
 
 #endif
diff --git a/src/mainboard/msi/ms9652_fam10/mptable.c b/src/mainboard/msi/ms9652_fam10/mptable.c
index 13b5d92125..6ae3de18f0 100644
--- a/src/mainboard/msi/ms9652_fam10/mptable.c
+++ b/src/mainboard/msi/ms9652_fam10/mptable.c
@@ -26,7 +26,7 @@ static void *smp_write_config_table(void *v)
 {
 	struct mp_config_table *mc;
 	struct mb_sysconf_t *m;
-	unsigned sbdn;
+	unsigned int sbdn;
 
 	int i, j, bus_isa;
 
diff --git a/src/mainboard/msi/ms9652_fam10/romstage.c b/src/mainboard/msi/ms9652_fam10/romstage.c
index 2fc6fb42f0..4658d75427 100644
--- a/src/mainboard/msi/ms9652_fam10/romstage.c
+++ b/src/mainboard/msi/ms9652_fam10/romstage.c
@@ -52,7 +52,7 @@ inline int spd_read_byte(unsigned int device, unsigned int address)
 	return smbus_read_byte(device, address);
 }
 
-unsigned get_sbdn(unsigned bus)
+unsigned int get_sbdn(unsigned int bus)
 {
 	pci_devfn_t dev;
 
diff --git a/src/mainboard/roda/rk9/ti_pci7xx1.c b/src/mainboard/roda/rk9/ti_pci7xx1.c
index 9f8e53ee2e..4154cc86bd 100644
--- a/src/mainboard/roda/rk9/ti_pci7xx1.c
+++ b/src/mainboard/roda/rk9/ti_pci7xx1.c
@@ -25,7 +25,7 @@ static void pci7xx1_enable(struct device *const dev)
 {
 	printk(BIOS_DEBUG, "%s: TI PCI7xx1 media controller\n", __func__);
 	if (PCI_FUNC(dev->path.pci.devfn) == 0) {
-		const unsigned slot = PCI_SLOT(dev->path.pci.devfn);
+		const unsigned int slot = PCI_SLOT(dev->path.pci.devfn);
 
 		int fn;
 
diff --git a/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
index 6279d9c060..0bb16d36b2 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/get_bus_conf.c
@@ -33,7 +33,7 @@ struct mb_sysconf_t mb_sysconf;
 void get_bus_conf(void)
 {
 
-	unsigned apicid_base;
+	unsigned int apicid_base;
 	struct mb_sysconf_t *m;
 
 	struct device *dev;
diff --git a/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c b/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c
index e33ceecbaa..69327dcafa 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/irq_tables.c
@@ -49,10 +49,10 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 
 	struct irq_routing_table *pirq;
 	struct irq_info *pirq_info;
-	unsigned slot_num;
+	unsigned int slot_num;
 	uint8_t *v;
 	struct mb_sysconf_t *m;
-	unsigned sbdn;
+	unsigned int sbdn;
 
 	uint8_t sum = 0;
 	int i;
@@ -96,8 +96,8 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	for (i = 1; i < sysconf.hc_possible_num; i++) {
 		if (!(sysconf.pci1234[i] & 0x1))
 			continue;
-		unsigned busn = (sysconf.pci1234[i] >> 12) & 0xff;
-		unsigned devn = sysconf.hcdn[i] & 0xff;
+		unsigned int busn = (sysconf.pci1234[i] >> 12) & 0xff;
+		unsigned int devn = sysconf.hcdn[i] & 0xff;
 
 		write_pirq_info(pirq_info, busn, PCI_DEVFN(devn, 0), 0x1, 0xdef8,
 				0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0);
diff --git a/src/mainboard/supermicro/h8dmr_fam10/mb_sysconf.h b/src/mainboard/supermicro/h8dmr_fam10/mb_sysconf.h
index ddd6cfe38f..1a287c6a8a 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/mb_sysconf.h
+++ b/src/mainboard/supermicro/h8dmr_fam10/mb_sysconf.h
@@ -20,7 +20,7 @@
 
 struct mb_sysconf_t {
 	unsigned char bus_mcp55[8]; //1
-	unsigned apicid_mcp55;
+	unsigned int apicid_mcp55;
 };
 
 #endif
diff --git a/src/mainboard/supermicro/h8dmr_fam10/mptable.c b/src/mainboard/supermicro/h8dmr_fam10/mptable.c
index d41551db27..cdb2980867 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/mptable.c
@@ -26,7 +26,7 @@ static void *smp_write_config_table(void *v)
 {
 	struct mp_config_table *mc;
 	struct mb_sysconf_t *m;
-	unsigned sbdn;
+	unsigned int sbdn;
 	int i, j, bus_isa;
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
diff --git a/src/mainboard/supermicro/h8dmr_fam10/romstage.c b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
index 2750129859..6f6ac712c7 100644
--- a/src/mainboard/supermicro/h8dmr_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8dmr_fam10/romstage.c
@@ -55,7 +55,7 @@ inline int spd_read_byte(unsigned int device, unsigned int address)
 	return smbus_read_byte(device, address);
 }
 
-unsigned get_sbdn(unsigned bus)
+unsigned int get_sbdn(unsigned int bus)
 {
 	pci_devfn_t dev;
 
diff --git a/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c b/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
index f32312d6dc..56ea43c7fe 100644
--- a/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
+++ b/src/mainboard/supermicro/h8qme_fam10/get_bus_conf.c
@@ -30,12 +30,12 @@
 // Global variables for MB layouts and these will be shared by irqtable mptable and acpi_tables
 struct mb_sysconf_t mb_sysconf;
 
-unsigned sbdn3;
+unsigned int sbdn3;
 
 void get_bus_conf(void)
 {
 
-	unsigned apicid_base;
+	unsigned int apicid_base;
 	struct mb_sysconf_t *m;
 
 	struct device *dev;
diff --git a/src/mainboard/supermicro/h8qme_fam10/irq_tables.c b/src/mainboard/supermicro/h8qme_fam10/irq_tables.c
index 5248567739..b77e86209b 100644
--- a/src/mainboard/supermicro/h8qme_fam10/irq_tables.c
+++ b/src/mainboard/supermicro/h8qme_fam10/irq_tables.c
@@ -49,10 +49,10 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 
 	struct irq_routing_table *pirq;
 	struct irq_info *pirq_info;
-	unsigned slot_num;
+	unsigned int slot_num;
 	uint8_t *v;
 	struct mb_sysconf_t *m;
-	unsigned sbdn;
+	unsigned int sbdn;
 
 	uint8_t sum = 0;
 	int i;
@@ -96,8 +96,8 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	for (i = 1; i < sysconf.hc_possible_num; i++) {
 		if (!(sysconf.pci1234[i] & 0x1))
 			continue;
-		unsigned busn = (sysconf.pci1234[i] >> 12) & 0xff;
-		unsigned devn = sysconf.hcdn[i] & 0xff;
+		unsigned int busn = (sysconf.pci1234[i] >> 12) & 0xff;
+		unsigned int devn = sysconf.hcdn[i] & 0xff;
 
 		write_pirq_info(pirq_info, busn, PCI_DEVFN(devn, 0), 0x1, 0x4ca0,
 				0x2, 0x4ca0, 0x3, 0x4ca0, 0x4, 0x4ca0, 0, 0);
diff --git a/src/mainboard/supermicro/h8qme_fam10/mb_sysconf.h b/src/mainboard/supermicro/h8qme_fam10/mb_sysconf.h
index de45310c62..f93f9e8380 100644
--- a/src/mainboard/supermicro/h8qme_fam10/mb_sysconf.h
+++ b/src/mainboard/supermicro/h8qme_fam10/mb_sysconf.h
@@ -20,13 +20,13 @@
 
 struct mb_sysconf_t {
 	unsigned char bus_mcp55[8]; //1
-	unsigned apicid_mcp55;
+	unsigned int apicid_mcp55;
 
 	unsigned char bus_8132_0;  //7
 	unsigned char bus_8132_1;  //8
 	unsigned char bus_8132_2;  //9
-	unsigned apicid_8132_1;
-	unsigned apicid_8132_2;
+	unsigned int apicid_8132_1;
+	unsigned int apicid_8132_2;
 };
 
 #endif
diff --git a/src/mainboard/supermicro/h8qme_fam10/mptable.c b/src/mainboard/supermicro/h8qme_fam10/mptable.c
index 8c884c4d65..7e6237f1f6 100644
--- a/src/mainboard/supermicro/h8qme_fam10/mptable.c
+++ b/src/mainboard/supermicro/h8qme_fam10/mptable.c
@@ -22,13 +22,13 @@
 #include <cpu/amd/amdfam10_sysconf.h>
 #include "mb_sysconf.h"
 
-extern unsigned sbdn3;
+extern unsigned int sbdn3;
 
 static void *smp_write_config_table(void *v)
 {
 	struct mp_config_table *mc;
 	struct mb_sysconf_t *m;
-	unsigned sbdn;
+	unsigned int sbdn;
 	int i, j, bus_isa;
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
diff --git a/src/mainboard/supermicro/h8qme_fam10/romstage.c b/src/mainboard/supermicro/h8qme_fam10/romstage.c
index 56d9f35ef2..7c489ca8dd 100644
--- a/src/mainboard/supermicro/h8qme_fam10/romstage.c
+++ b/src/mainboard/supermicro/h8qme_fam10/romstage.c
@@ -63,7 +63,7 @@ inline int spd_read_byte(unsigned int device, unsigned int address)
 	return smbus_read_byte(device, address);
 }
 
-unsigned get_sbdn(unsigned bus)
+unsigned int get_sbdn(unsigned int bus)
 {
 	pci_devfn_t dev;
 
diff --git a/src/mainboard/tyan/s2912_fam10/get_bus_conf.c b/src/mainboard/tyan/s2912_fam10/get_bus_conf.c
index f589ef6c8d..7155813394 100644
--- a/src/mainboard/tyan/s2912_fam10/get_bus_conf.c
+++ b/src/mainboard/tyan/s2912_fam10/get_bus_conf.c
@@ -32,7 +32,7 @@ struct mb_sysconf_t mb_sysconf;
 
 void get_bus_conf(void)
 {
-	unsigned apicid_base;
+	unsigned int apicid_base;
 	struct mb_sysconf_t *m;
 
 	struct device *dev;
diff --git a/src/mainboard/tyan/s2912_fam10/irq_tables.c b/src/mainboard/tyan/s2912_fam10/irq_tables.c
index e33ceecbaa..69327dcafa 100644
--- a/src/mainboard/tyan/s2912_fam10/irq_tables.c
+++ b/src/mainboard/tyan/s2912_fam10/irq_tables.c
@@ -49,10 +49,10 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 
 	struct irq_routing_table *pirq;
 	struct irq_info *pirq_info;
-	unsigned slot_num;
+	unsigned int slot_num;
 	uint8_t *v;
 	struct mb_sysconf_t *m;
-	unsigned sbdn;
+	unsigned int sbdn;
 
 	uint8_t sum = 0;
 	int i;
@@ -96,8 +96,8 @@ unsigned long write_pirq_routing_table(unsigned long addr)
 	for (i = 1; i < sysconf.hc_possible_num; i++) {
 		if (!(sysconf.pci1234[i] & 0x1))
 			continue;
-		unsigned busn = (sysconf.pci1234[i] >> 12) & 0xff;
-		unsigned devn = sysconf.hcdn[i] & 0xff;
+		unsigned int busn = (sysconf.pci1234[i] >> 12) & 0xff;
+		unsigned int devn = sysconf.hcdn[i] & 0xff;
 
 		write_pirq_info(pirq_info, busn, PCI_DEVFN(devn, 0), 0x1, 0xdef8,
 				0x2, 0xdef8, 0x3, 0xdef8, 0x4, 0xdef8, 0, 0);
diff --git a/src/mainboard/tyan/s2912_fam10/mb_sysconf.h b/src/mainboard/tyan/s2912_fam10/mb_sysconf.h
index ddd6cfe38f..1a287c6a8a 100644
--- a/src/mainboard/tyan/s2912_fam10/mb_sysconf.h
+++ b/src/mainboard/tyan/s2912_fam10/mb_sysconf.h
@@ -20,7 +20,7 @@
 
 struct mb_sysconf_t {
 	unsigned char bus_mcp55[8]; //1
-	unsigned apicid_mcp55;
+	unsigned int apicid_mcp55;
 };
 
 #endif
diff --git a/src/mainboard/tyan/s2912_fam10/mptable.c b/src/mainboard/tyan/s2912_fam10/mptable.c
index 1781a6627d..5563aef2cf 100644
--- a/src/mainboard/tyan/s2912_fam10/mptable.c
+++ b/src/mainboard/tyan/s2912_fam10/mptable.c
@@ -26,7 +26,7 @@ static void *smp_write_config_table(void *v)
 {
 	struct mp_config_table *mc;
 	struct mb_sysconf_t *m;
-	unsigned sbdn;
+	unsigned int sbdn;
 	int i, j, bus_isa;
 
 	mc = (void *)(((char *)v) + SMP_FLOATING_TABLE_LEN);
diff --git a/src/mainboard/tyan/s2912_fam10/romstage.c b/src/mainboard/tyan/s2912_fam10/romstage.c
index f44346bbb6..c546a3309f 100644
--- a/src/mainboard/tyan/s2912_fam10/romstage.c
+++ b/src/mainboard/tyan/s2912_fam10/romstage.c
@@ -62,7 +62,7 @@ inline int spd_read_byte(unsigned int device, unsigned int address)
 #include <southbridge/nvidia/mcp55/early_setup_ss.h>
 #include "southbridge/nvidia/mcp55/early_setup_car.c"
 
-unsigned get_sbdn(unsigned bus)
+unsigned int get_sbdn(unsigned int bus)
 {
 	pci_devfn_t dev;