* [U-Boot] [PATCH] spl: net: Add FIT image support over network boot
@ 2017-02-07 22:59 Andrew F. Davis
2017-02-08 10:07 ` Vignesh R
2017-02-08 14:05 ` Lokesh Vutla
0 siblings, 2 replies; 5+ messages in thread
From: Andrew F. Davis @ 2017-02-07 22:59 UTC (permalink / raw)
To: u-boot
FIT support in the net boot case is much like the RAM boot case in that
we load our image to "load_addr" and pass a dummy read function into
"spl_load_simple_fit()". As the load address is no longer hard-coded to
the final execution address, RAW image loading will rely on "load_addr"
pointing to the execution address as they should have before.
Signed-off-by: Andrew F. Davis <afd@ti.com>
---
common/spl/spl_net.c | 30 +++++++++++++++++++++++++++---
1 file changed, 27 insertions(+), 3 deletions(-)
diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
index 0fba0172ea..b7a4a89198 100644
--- a/common/spl/spl_net.c
+++ b/common/spl/spl_net.c
@@ -11,19 +11,29 @@
#include <errno.h>
#include <spl.h>
#include <net.h>
+#include <libfdt.h>
DECLARE_GLOBAL_DATA_PTR;
+static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
+ ulong count, void *buf)
+{
+ debug("%s: sector %lx, count %lx, buf %lx\n",
+ __func__, sector, count, (ulong)buf);
+ memcpy(buf, (void *)(load_addr + sector), count);
+ return count;
+}
+
#if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)
static int spl_net_load_image(struct spl_image_info *spl_image,
struct spl_boot_device *bootdev)
{
+ struct image_header *header = (struct image_header *)load_addr;
int rv;
env_init();
env_relocate();
setenv("autoload", "yes");
- load_addr = CONFIG_SYS_TEXT_BASE - sizeof(struct image_header);
rv = eth_initialize();
if (rv == 0) {
printf("No Ethernet devices found\n");
@@ -36,8 +46,22 @@ static int spl_net_load_image(struct spl_image_info *spl_image,
printf("Problem booting with BOOTP\n");
return rv;
}
- return spl_parse_image_header(spl_image,
- (struct image_header *)load_addr);
+
+ if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
+ image_get_magic(header) == FDT_MAGIC) {
+ struct spl_load_info load;
+
+ debug("Found FIT\n");
+ load.bl_len = 1;
+ load.read = spl_net_load_read;
+ rv = spl_load_simple_fit(spl_image, &load, 0, header);
+ } else {
+ debug("Legacy image\n");
+
+ rv = spl_parse_image_header(spl_image, header);
+ }
+
+ return rv;
}
#endif
--
2.11.0
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] spl: net: Add FIT image support over network boot
2017-02-07 22:59 [U-Boot] [PATCH] spl: net: Add FIT image support over network boot Andrew F. Davis
@ 2017-02-08 10:07 ` Vignesh R
2017-02-08 16:33 ` Andrew F. Davis
2017-02-08 14:05 ` Lokesh Vutla
1 sibling, 1 reply; 5+ messages in thread
From: Vignesh R @ 2017-02-08 10:07 UTC (permalink / raw)
To: u-boot
On Wednesday 08 February 2017 04:29 AM, Andrew F. Davis wrote:
> FIT support in the net boot case is much like the RAM boot case in that
> we load our image to "load_addr" and pass a dummy read function into
> "spl_load_simple_fit()". As the load address is no longer hard-coded to
> the final execution address, RAW image loading will rely on "load_addr"
> pointing to the execution address as they should have before.
>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
> common/spl/spl_net.c | 30 +++++++++++++++++++++++++++---
> 1 file changed, 27 insertions(+), 3 deletions(-)
>
> diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
> index 0fba0172ea..b7a4a89198 100644
> --- a/common/spl/spl_net.c
> +++ b/common/spl/spl_net.c
> @@ -11,19 +11,29 @@
> #include <errno.h>
> #include <spl.h>
> #include <net.h>
> +#include <libfdt.h>
>
> DECLARE_GLOBAL_DATA_PTR;
>
> +static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
> + ulong count, void *buf)
> +{
> + debug("%s: sector %lx, count %lx, buf %lx\n",
> + __func__, sector, count, (ulong)buf);
> + memcpy(buf, (void *)(load_addr + sector), count);
> + return count;
> +}
> +
You may have to move above function within below #if block as
spl_net_load_read() is used only by spl_net_load_image().
> #if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)
> static int spl_net_load_image(struct spl_image_info *spl_image,
> struct spl_boot_device *bootdev)
> {
> + struct image_header *header = (struct image_header *)load_addr;
> int rv;
>
> env_init();
> env_relocate();
> setenv("autoload", "yes");
> - load_addr = CONFIG_SYS_TEXT_BASE - sizeof(struct image_header);
> rv = eth_initialize();
> if (rv == 0) {
> printf("No Ethernet devices found\n");
> @@ -36,8 +46,22 @@ static int spl_net_load_image(struct spl_image_info *spl_image,
> printf("Problem booting with BOOTP\n");
> return rv;
> }
> - return spl_parse_image_header(spl_image,
> - (struct image_header *)load_addr);
> +
> + if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
> + image_get_magic(header) == FDT_MAGIC) {
> + struct spl_load_info load;
> +
> + debug("Found FIT\n");
> + load.bl_len = 1;
> + load.read = spl_net_load_read;
> + rv = spl_load_simple_fit(spl_image, &load, 0, header);
> + } else {
> + debug("Legacy image\n");
> +
> + rv = spl_parse_image_header(spl_image, header);
> + }
> +
> + return rv;
> }
> #endif
>
>
--
Regards
Vignesh
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] spl: net: Add FIT image support over network boot
2017-02-07 22:59 [U-Boot] [PATCH] spl: net: Add FIT image support over network boot Andrew F. Davis
2017-02-08 10:07 ` Vignesh R
@ 2017-02-08 14:05 ` Lokesh Vutla
2017-02-08 16:33 ` Andrew F. Davis
1 sibling, 1 reply; 5+ messages in thread
From: Lokesh Vutla @ 2017-02-08 14:05 UTC (permalink / raw)
To: u-boot
On Wednesday 08 February 2017 04:29 AM, Andrew F. Davis wrote:
> FIT support in the net boot case is much like the RAM boot case in that
> we load our image to "load_addr" and pass a dummy read function into
> "spl_load_simple_fit()". As the load address is no longer hard-coded to
> the final execution address, RAW image loading will rely on "load_addr"
> pointing to the execution address as they should have before.
>
> Signed-off-by: Andrew F. Davis <afd@ti.com>
> ---
> common/spl/spl_net.c | 30 +++++++++++++++++++++++++++---
> 1 file changed, 27 insertions(+), 3 deletions(-)
>
> diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
> index 0fba0172ea..b7a4a89198 100644
> --- a/common/spl/spl_net.c
> +++ b/common/spl/spl_net.c
> @@ -11,19 +11,29 @@
> #include <errno.h>
> #include <spl.h>
> #include <net.h>
> +#include <libfdt.h>
>
> DECLARE_GLOBAL_DATA_PTR;
>
> +static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
> + ulong count, void *buf)
> +{
> + debug("%s: sector %lx, count %lx, buf %lx\n",
> + __func__, sector, count, (ulong)buf);
> + memcpy(buf, (void *)(load_addr + sector), count);
> + return count;
> +}
> +
> #if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)
> static int spl_net_load_image(struct spl_image_info *spl_image,
> struct spl_boot_device *bootdev)
> {
> + struct image_header *header = (struct image_header *)load_addr;
Just wondering what is the default load_addr or who sets load_addr
before doing tftp? have you verified both FIT and not FIT case?
Thanks and regards,
Lokesh
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] spl: net: Add FIT image support over network boot
2017-02-08 14:05 ` Lokesh Vutla
@ 2017-02-08 16:33 ` Andrew F. Davis
0 siblings, 0 replies; 5+ messages in thread
From: Andrew F. Davis @ 2017-02-08 16:33 UTC (permalink / raw)
To: u-boot
On 02/08/2017 08:05 AM, Lokesh Vutla wrote:
>
>
> On Wednesday 08 February 2017 04:29 AM, Andrew F. Davis wrote:
>> FIT support in the net boot case is much like the RAM boot case in that
>> we load our image to "load_addr" and pass a dummy read function into
>> "spl_load_simple_fit()". As the load address is no longer hard-coded to
>> the final execution address, RAW image loading will rely on "load_addr"
>> pointing to the execution address as they should have before.
>>
>> Signed-off-by: Andrew F. Davis <afd@ti.com>
>> ---
>> common/spl/spl_net.c | 30 +++++++++++++++++++++++++++---
>> 1 file changed, 27 insertions(+), 3 deletions(-)
>>
>> diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
>> index 0fba0172ea..b7a4a89198 100644
>> --- a/common/spl/spl_net.c
>> +++ b/common/spl/spl_net.c
>> @@ -11,19 +11,29 @@
>> #include <errno.h>
>> #include <spl.h>
>> #include <net.h>
>> +#include <libfdt.h>
>>
>> DECLARE_GLOBAL_DATA_PTR;
>>
>> +static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
>> + ulong count, void *buf)
>> +{
>> + debug("%s: sector %lx, count %lx, buf %lx\n",
>> + __func__, sector, count, (ulong)buf);
>> + memcpy(buf, (void *)(load_addr + sector), count);
>> + return count;
>> +}
>> +
>> #if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)
>> static int spl_net_load_image(struct spl_image_info *spl_image,
>> struct spl_boot_device *bootdev)
>> {
>> + struct image_header *header = (struct image_header *)load_addr;
>
> Just wondering what is the default load_addr or who sets load_addr
> before doing tftp? have you verified both FIT and not FIT case?
>
The default is set to CONFIG_SYS_LOAD_ADDR, this is where the other SPL
loaders put the image, spl_net was the odd case before this patch.
The Legacy image, like FIT encodes the relocation address, RAW images
would have never worked with netboot due to the hard-coded shift to
compensate for the legacy image header.
Andrew
> Thanks and regards,
> Lokesh
>
^ permalink raw reply [flat|nested] 5+ messages in thread
* [U-Boot] [PATCH] spl: net: Add FIT image support over network boot
2017-02-08 10:07 ` Vignesh R
@ 2017-02-08 16:33 ` Andrew F. Davis
0 siblings, 0 replies; 5+ messages in thread
From: Andrew F. Davis @ 2017-02-08 16:33 UTC (permalink / raw)
To: u-boot
On 02/08/2017 04:07 AM, Vignesh R wrote:
>
>
> On Wednesday 08 February 2017 04:29 AM, Andrew F. Davis wrote:
>> FIT support in the net boot case is much like the RAM boot case in that
>> we load our image to "load_addr" and pass a dummy read function into
>> "spl_load_simple_fit()". As the load address is no longer hard-coded to
>> the final execution address, RAW image loading will rely on "load_addr"
>> pointing to the execution address as they should have before.
>>
>> Signed-off-by: Andrew F. Davis <afd@ti.com>
>> ---
>> common/spl/spl_net.c | 30 +++++++++++++++++++++++++++---
>> 1 file changed, 27 insertions(+), 3 deletions(-)
>>
>> diff --git a/common/spl/spl_net.c b/common/spl/spl_net.c
>> index 0fba0172ea..b7a4a89198 100644
>> --- a/common/spl/spl_net.c
>> +++ b/common/spl/spl_net.c
>> @@ -11,19 +11,29 @@
>> #include <errno.h>
>> #include <spl.h>
>> #include <net.h>
>> +#include <libfdt.h>
>>
>> DECLARE_GLOBAL_DATA_PTR;
>>
>> +static ulong spl_net_load_read(struct spl_load_info *load, ulong sector,
>> + ulong count, void *buf)
>> +{
>> + debug("%s: sector %lx, count %lx, buf %lx\n",
>> + __func__, sector, count, (ulong)buf);
>> + memcpy(buf, (void *)(load_addr + sector), count);
>> + return count;
>> +}
>> +
>
> You may have to move above function within below #if block as
> spl_net_load_read() is used only by spl_net_load_image().
>
Good catch, will move.
Thanks,
Andrew
>> #if defined(CONFIG_SPL_ETH_SUPPORT) || defined(CONFIG_SPL_USBETH_SUPPORT)
>> static int spl_net_load_image(struct spl_image_info *spl_image,
>> struct spl_boot_device *bootdev)
>> {
>> + struct image_header *header = (struct image_header *)load_addr;
>> int rv;
>>
>> env_init();
>> env_relocate();
>> setenv("autoload", "yes");
>> - load_addr = CONFIG_SYS_TEXT_BASE - sizeof(struct image_header);
>> rv = eth_initialize();
>> if (rv == 0) {
>> printf("No Ethernet devices found\n");
>> @@ -36,8 +46,22 @@ static int spl_net_load_image(struct spl_image_info *spl_image,
>> printf("Problem booting with BOOTP\n");
>> return rv;
>> }
>> - return spl_parse_image_header(spl_image,
>> - (struct image_header *)load_addr);
>> +
>> + if (IS_ENABLED(CONFIG_SPL_LOAD_FIT) &&
>> + image_get_magic(header) == FDT_MAGIC) {
>> + struct spl_load_info load;
>> +
>> + debug("Found FIT\n");
>> + load.bl_len = 1;
>> + load.read = spl_net_load_read;
>> + rv = spl_load_simple_fit(spl_image, &load, 0, header);
>> + } else {
>> + debug("Legacy image\n");
>> +
>> + rv = spl_parse_image_header(spl_image, header);
>> + }
>> +
>> + return rv;
>> }
>> #endif
>>
>>
>
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2017-02-08 16:33 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2017-02-07 22:59 [U-Boot] [PATCH] spl: net: Add FIT image support over network boot Andrew F. Davis
2017-02-08 10:07 ` Vignesh R
2017-02-08 16:33 ` Andrew F. Davis
2017-02-08 14:05 ` Lokesh Vutla
2017-02-08 16:33 ` Andrew F. Davis
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.