summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/boards/nhk8815/setup.c6
-rw-r--r--arch/arm/boards/pcm038/pcm970.c2
-rw-r--r--arch/arm/lib/bootm.c8
-rw-r--r--arch/arm/mach-at91/at91sam9260_devices.c4
-rw-r--r--arch/arm/mach-at91/at91sam9263_devices.c4
-rw-r--r--arch/arm/mach-at91/at91sam9g45_devices.c4
-rw-r--r--arch/arm/mach-at91/at91sam9x5_devices.c4
-rw-r--r--arch/arm/mach-imx/include/mach/devices-imx51.h4
-rw-r--r--arch/arm/mach-imx/include/mach/devices-imx53.h4
-rw-r--r--arch/nios2/boards/generic/generic.c6
10 files changed, 23 insertions, 23 deletions
diff --git a/arch/arm/boards/nhk8815/setup.c b/arch/arm/boards/nhk8815/setup.c
index 173892acd8..ccc0510555 100644
--- a/arch/arm/boards/nhk8815/setup.c
+++ b/arch/arm/boards/nhk8815/setup.c
@@ -55,15 +55,15 @@ static struct nomadik_nand_platform_data nhk8815_nand_data = {
static struct resource nhk8815_nand_resources[] = {
{
.start = NAND_IO_ADDR,
- .size = 0xfff,
+ .end = NAND_IO_ADDR + 0xfff,
.flags = IORESOURCE_MEM,
}, {
.start = NAND_IO_CMD,
- .size = 0xfff,
+ .end = NAND_IO_CMD + 0xfff,
.flags = IORESOURCE_MEM,
}, {
.start = NAND_IO_DATA,
- .size = 0xfff,
+ .end = NAND_IO_CMD + 0xfff,
.flags = IORESOURCE_MEM,
}
};
diff --git a/arch/arm/boards/pcm038/pcm970.c b/arch/arm/boards/pcm038/pcm970.c
index ca10afb8ca..df9b8521ea 100644
--- a/arch/arm/boards/pcm038/pcm970.c
+++ b/arch/arm/boards/pcm038/pcm970.c
@@ -55,7 +55,7 @@ static void pcm970_usbh2_init(void)
static struct resource pcm970_ide_resources[] = {
{
.start = IMX_PCMCIA_MEM_BASE,
- .size = SZ_1K,
+ .end = IMX_PCMCIA_MEM_BASE + SZ_1K - 1,
.flags = IORESOURCE_MEM,
},
};
diff --git a/arch/arm/lib/bootm.c b/arch/arm/lib/bootm.c
index 033e2eb15b..3a00437069 100644
--- a/arch/arm/lib/bootm.c
+++ b/arch/arm/lib/bootm.c
@@ -80,7 +80,7 @@ static int __do_bootm_linux(struct image_data *data, int swap)
if (data->initrd_res) {
initrd_start = data->initrd_res->start;
- initrd_size = data->initrd_res->size;
+ initrd_size = resource_size(data->initrd_res);
}
if (bootm_verbose(data)) {
@@ -154,7 +154,7 @@ static int do_bootz_linux_fdt(int fd, struct image_data *data)
}
} else {
- of_res = request_sdram_region("oftree", r->start + r->size, end);
+ of_res = request_sdram_region("oftree", r->start + resource_size(r), end);
if (!of_res) {
perror("zImage: oftree request_sdram_region");
return -ENOMEM;
@@ -310,9 +310,9 @@ static int aimage_load_resource(int fd, struct resource *r, void* buf, int ps)
{
int ret;
void *image = (void *)r->start;
- unsigned to_read = ps - r->size % ps;
+ unsigned to_read = ps - resource_size(r) % ps;
- ret = read_full(fd, image, r->size);
+ ret = read_full(fd, image, resource_size(r));
if (ret < 0)
return ret;
diff --git a/arch/arm/mach-at91/at91sam9260_devices.c b/arch/arm/mach-at91/at91sam9260_devices.c
index 3297a89f37..b56ca14d1d 100644
--- a/arch/arm/mach-at91/at91sam9260_devices.c
+++ b/arch/arm/mach-at91/at91sam9260_devices.c
@@ -111,12 +111,12 @@ void at91_add_device_eth(int id, struct at91_ether_platform_data *data) {}
static struct resource nand_resources[] = {
[0] = {
.start = AT91_CHIPSELECT_3,
- .size = SZ_256M,
+ .end = AT91_CHIPSELECT_3 + SZ_256M - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = AT91_BASE_SYS + AT91_ECC,
- .size = 512,
+ .end = AT91_BASE_SYS + AT91_ECC + 512 - 1,
.flags = IORESOURCE_MEM,
}
};
diff --git a/arch/arm/mach-at91/at91sam9263_devices.c b/arch/arm/mach-at91/at91sam9263_devices.c
index 2ebc4da596..7f916d21a4 100644
--- a/arch/arm/mach-at91/at91sam9263_devices.c
+++ b/arch/arm/mach-at91/at91sam9263_devices.c
@@ -113,12 +113,12 @@ void at91_add_device_eth(int id, struct at91_ether_platform_data *data) {}
static struct resource nand_resources[] = {
[0] = {
.start = AT91_CHIPSELECT_3,
- .size = SZ_256M,
+ .end = AT91_CHIPSELECT_3 + SZ_256M - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = AT91_BASE_SYS + AT91_ECC0,
- .size = 512,
+ .end = AT91_BASE_SYS + AT91_ECC0 + 512 - 1,
.flags = IORESOURCE_MEM,
}
};
diff --git a/arch/arm/mach-at91/at91sam9g45_devices.c b/arch/arm/mach-at91/at91sam9g45_devices.c
index d406bcc4bf..22b455e1a9 100644
--- a/arch/arm/mach-at91/at91sam9g45_devices.c
+++ b/arch/arm/mach-at91/at91sam9g45_devices.c
@@ -93,12 +93,12 @@ void at91_add_device_eth(int id, struct at91_ether_platform_data *data) {}
static struct resource nand_resources[] = {
[0] = {
.start = AT91_CHIPSELECT_3,
- .size = SZ_256M,
+ .end = AT91_CHIPSELECT_3 + SZ_256M - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = AT91_BASE_SYS + AT91_ECC,
- .size = 512,
+ .end = AT91_BASE_SYS + AT91_ECC + 512 - 1,
.flags = IORESOURCE_MEM,
}
};
diff --git a/arch/arm/mach-at91/at91sam9x5_devices.c b/arch/arm/mach-at91/at91sam9x5_devices.c
index 50bad7f780..26a380d2ce 100644
--- a/arch/arm/mach-at91/at91sam9x5_devices.c
+++ b/arch/arm/mach-at91/at91sam9x5_devices.c
@@ -130,12 +130,12 @@ void at91_add_device_eth(int id, struct at91_ether_platform_data *data) {}
static struct resource nand_resources[] = {
[0] = {
.start = AT91_CHIPSELECT_3,
- .size = SZ_256M,
+ .end = AT91_CHIPSELECT_3 + SZ_256M - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = AT91_BASE_SYS + AT91_PMECC,
- .size = 512,
+ .end = AT91_BASE_SYS + AT91_PMECC + 512 - 1,
.flags = IORESOURCE_MEM,
}
};
diff --git a/arch/arm/mach-imx/include/mach/devices-imx51.h b/arch/arm/mach-imx/include/mach/devices-imx51.h
index 5de0fa776c..dbf58622c9 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx51.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx51.h
@@ -67,11 +67,11 @@ static inline struct device_d *imx51_add_nand(struct imx_nand_platform_data *pda
struct resource res[] = {
{
.start = MX51_NFC_BASE_ADDR,
- .size = SZ_4K,
+ .end = MX51_NFC_BASE_ADDR + SZ_4K - 1,
.flags = IORESOURCE_MEM,
}, {
.start = MX51_NFC_AXI_BASE_ADDR,
- .size = SZ_4K,
+ .end = MX51_NFC_AXI_BASE_ADDR + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
};
diff --git a/arch/arm/mach-imx/include/mach/devices-imx53.h b/arch/arm/mach-imx/include/mach/devices-imx53.h
index a9fe454d39..0fc4b5cf02 100644
--- a/arch/arm/mach-imx/include/mach/devices-imx53.h
+++ b/arch/arm/mach-imx/include/mach/devices-imx53.h
@@ -61,11 +61,11 @@ static inline struct device_d *imx53_add_nand(struct imx_nand_platform_data *pda
struct resource res[] = {
{
.start = MX53_NFC_BASE_ADDR,
- .size = SZ_4K,
+ .end = MX53_NFC_BASE_ADDR + SZ_4K - 1,
.flags = IORESOURCE_MEM,
}, {
.start = MX53_NFC_AXI_BASE_ADDR,
- .size = SZ_4K,
+ .end = MX53_NFC_AXI_BASE_ADDR + SZ_4K - 1,
.flags = IORESOURCE_MEM,
},
};
diff --git a/arch/nios2/boards/generic/generic.c b/arch/nios2/boards/generic/generic.c
index b51b94afbf..2c998fe3ac 100644
--- a/arch/nios2/boards/generic/generic.c
+++ b/arch/nios2/boards/generic/generic.c
@@ -9,17 +9,17 @@ static int phy_address = 1;
static struct resource mac_resources[] = {
[0] = {
.start = NIOS_SOPC_TSE_BASE,
- .size = 0x400,
+ .end = NIOS_SOPC_TSE_BASE + 0x400 - 1,
.flags = IORESOURCE_MEM,
},
[1] = {
.start = NIOS_SOPC_SGDMA_RX_BASE,
- .size = 0x40,
+ .end = 0x40 + NIOS_SOPC_SGDMA_RX_BASE - 1,
.flags = IORESOURCE_MEM,
},
[2] = {
.start = NIOS_SOPC_SGDMA_TX_BASE,
- .size = 0x40,
+ .end = 0x40 + NIOS_SOPC_SGDMA_TX_BASE - 1,
.flags = IORESOURCE_MEM,
},
};
generated by cgit v1.2.3 (git 2.39.1) at 2024-04-27 06:53:16 +0000