[flasher PATCH 1/2] allow --boards/--socs to undisable boards

[flasher PATCH 1/2] allow --boards/--socs to undisable boards

[Stephen Warren]

From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

Before this change, --boards/--socs only disabled more boards than were
disabled in their configuration files. Now, those options explicitly set
all boards/socs disabled state to match the --boards/socs option, if
given.

This is useful so that configurations may be added for boards that are
not yet fully supported by projects such as U-Boot; the configuration
can be added, but marked as disabled by default so that builds are not
broken, but then explicitly re-enabled by those who wish to test local
patches to enable that board in the other projects.

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 build | 12 +++++-------
 1 file changed, 5 insertions(+), 7 deletions(-)

diff --git a/build b/build
index 8f86d32..b0587f5 100755
--- a/build
+++ b/build
@@ -83,7 +83,7 @@ def run(dir, cmd):
 
 def all_enabled_confignames():
     for configname in configs.keys():
-        if configs[configname].has_key('disabled'):
+        if configs[configname].get('disabled', False):
             continue
         yield configname
 
@@ -105,23 +105,21 @@ def all_enabled_boardnames():
 def user_restrict_socs(enabled_socs):
     enabled_socs = enabled_socs.split(',')
     for socname in socs.keys():
-        if not socname in enabled_socs:
-            socs[socname]['disabled'] = True
+        socs[socname]['disabled'] = not socname in enabled_socs
 
 def user_restrict_boards(enabled_boards):
     enabled_boards = enabled_boards.split(',')
     for boardname in boards.keys():
-        if not boardname in enabled_boards:
-            boards[boardname]['disabled'] = True
+        boards[boardname]['disabled'] = not boardname in enabled_boards
 
 def restrict_boards():
     for board in boards.values():
-        if socs[board['soc']].has_key('disabled'):
+        if socs[board['soc']].get('disabled', False):
             board['disabled'] = True
 
 def restrict_configs():
     for config in configs.values():
-        if boards[config['board']].has_key('disabled'):
+        if boards[config['board']].get('disabled', False):
             config['disabled'] = True
 
 def dtb_filename(config):
-- 
1.8.1.5

[flasher PATCH 2/2] Add config files for Venice2 board

[Stephen Warren]

From: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>

This board is currently disabled by default due to lack of U-Boot support
in the mainline repository. If you wish to test this, do as follows:

cd u-boot
git checkout some-branch-with-venice2-support
cd ../scripts
./build --boards venice2 build

Signed-off-by: Stephen Warren <swarren-DDmLM1+adcrQT0dZR+AlfA@public.gmane.org>
---
 configs/tegra124.soc   | 3 +++
 configs/venice2.board  | 5 +++++
 configs/venice2.config | 8 ++++++++
 3 files changed, 16 insertions(+)
 create mode 100644 configs/tegra124.soc
 create mode 100644 configs/venice2.board
 create mode 100644 configs/venice2.config

diff --git a/configs/tegra124.soc b/configs/tegra124.soc
new file mode 100644
index 0000000..f5b29d9
--- /dev/null
+++ b/configs/tegra124.soc
@@ -0,0 +1,3 @@
+soc = {
+    'ram-base': 0x80000000,
+}
diff --git a/configs/venice2.board b/configs/venice2.board
new file mode 100644
index 0000000..1dfb14c
--- /dev/null
+++ b/configs/venice2.board
@@ -0,0 +1,5 @@
+board = {
+    'vendor': 'nvidia',
+    'soc': 'tegra124',
+    'disabled': True,
+}
diff --git a/configs/venice2.config b/configs/venice2.config
new file mode 100644
index 0000000..15d0b67
--- /dev/null
+++ b/configs/venice2.config
@@ -0,0 +1,8 @@
+config = {
+    'bct': 'PM371_Hynix_2GB_H5TC4G63AFR_RDA_792MHz_0719.bct',
+    'board': 'venice2',
+    'dtbfn-extra': '',
+    'flash-erase-size': 1048576,
+    'flash-image': 'venice2-spi.img',
+    'flash-type': 'spi',
+}
-- 
1.8.1.5

Re: [flasher PATCH 2/2] Add config files for Venice2 board

[Stephen Warren]

On 09/11/2013 05:48 PM, Stephen Warren wrote:
> This board is currently disabled by default due to lack of U-Boot support
> in the mainline repository. If you wish to test this, do as follows:
> 
> cd u-boot
> git checkout some-branch-with-venice2-support
> cd ../scripts
> ./build --boards venice2 build

Peter, do you have a Venice2 yet? If so, could I trouble you to apply
the tegrarcm Tegra124 support patches from Allen, the cbootimage-configs
and tegra-uboot-flasher-scripts patches from me, grab a downstream
Venice2 U-Boot branch, and validate that it all works?

If not, perhaps I could persuade Allen or someone else to do it.

Thanks!

Re: [flasher PATCH 2/2] Add config files for Venice2 board

[Peter De Schrijver]

On Thu, Sep 12, 2013 at 01:51:06AM +0200, Stephen Warren wrote:
> On 09/11/2013 05:48 PM, Stephen Warren wrote:
> > This board is currently disabled by default due to lack of U-Boot support
> > in the mainline repository. If you wish to test this, do as follows:
> > 
> > cd u-boot
> > git checkout some-branch-with-venice2-support
> > cd ../scripts
> > ./build --boards venice2 build
> 
> Peter, do you have a Venice2 yet? If so, could I trouble you to apply
> the tegrarcm Tegra124 support patches from Allen, the cbootimage-configs
> and tegra-uboot-flasher-scripts patches from me, grab a downstream
> Venice2 U-Boot branch, and validate that it all works?
> 

It builds all fine, but flashing as such fails with:

U-Boot SPL 2013.04-g4e07053 (Sep 13 2013 - 16:11:40)


U-Boot 2013.04-g4e07053 (Sep 13 2013 - 16:11:40)

TEGRA124
Board: NVIDIA Venice2
DRAM:  2 GiB
WARNING: Caches not enabled
MMC:   Tegra SD/MMC: 0, Tegra SD/MMC: 1
In:    serial
Out:   serial
Err:   serial
Net:   Net Initialization Skipped
No ethernet found.
(Re)start USB...
USB0:   USB EHCI 1.10
scanning bus 0 for devices... 2 USB Device(s) found
       scanning usb for storage devices... 0 Storage Device(s) found
       scanning usb for ethernet devices... 1 Ethernet Device(s) found
Hit any key to stop autoboot:  0
SF: Unsupported manufacturer fc
Failed to initialize SPI flash at 0:0
No SPI flash selected. Please run `sf probe'
No SPI flash selected. Please run `sf probe'
## Resetting to default environment
Saving Environment to MMC...
Writing to MMC(0)... done
resetting ...

Re: [flasher PATCH 2/2] Add config files for Venice2 board

[Stephen Warren]

On 09/13/2013 07:22 AM, Peter De Schrijver wrote:
> On Thu, Sep 12, 2013 at 01:51:06AM +0200, Stephen Warren wrote:
>> On 09/11/2013 05:48 PM, Stephen Warren wrote:
>>> This board is currently disabled by default due to lack of U-Boot support
>>> in the mainline repository. If you wish to test this, do as follows:
>>>
>>> cd u-boot
>>> git checkout some-branch-with-venice2-support
>>> cd ../scripts
>>> ./build --boards venice2 build
>>
>> Peter, do you have a Venice2 yet? If so, could I trouble you to apply
>> the tegrarcm Tegra124 support patches from Allen, the cbootimage-configs
>> and tegra-uboot-flasher-scripts patches from me, grab a downstream
>> Venice2 U-Boot branch, and validate that it all works?
>>
> 
> It builds all fine, but flashing as such fails with:
> 
> U-Boot SPL 2013.04-g4e07053 (Sep 13 2013 - 16:11:40)
> 
> 
> U-Boot 2013.04-g4e07053 (Sep 13 2013 - 16:11:40)

OK, the fact that U-Boot started booting at all means that at least the
BCT is fine, since the code executed from DRAM OK.

...
> SF: Unsupported manufacturer fc
> Failed to initialize SPI flash at 0:0
> No SPI flash selected. Please run `sf probe'
> No SPI flash selected. Please run `sf probe'

Hmm. I assume if you just "exec" U-Boot rather than "flash" it (or if
you run U-Boot through some mechanism other than
tegrarcm/tegra-uboot-flasher), the "sf probe 0" fails in the same way?
That sounds like (that branch of) U-Boot simply doesn't have SPI flash
support yet, or doesn't support the specific chip on the board. So,
there's /probably/ nothing wrong with the flasher scripts either.

> ## Resetting to default environment
> Saving Environment to MMC...
> Writing to MMC(0)... done
> resetting ...

Oh. U-Boot is saving the environment to eMMC... That's odd considering
the BCT is set up for SPI boot. I would expect the two to be consistent.
Do you know if the fuses/straps are set up for SPI or eMMC boot?

Re: [flasher PATCH 2/2] Add config files for Venice2 board

[Stephen Warren]

On 09/13/2013 10:19 AM, Stephen Warren wrote:
> On 09/13/2013 07:22 AM, Peter De Schrijver wrote:
>> On Thu, Sep 12, 2013 at 01:51:06AM +0200, Stephen Warren wrote:
>>> On 09/11/2013 05:48 PM, Stephen Warren wrote:
>>>> This board is currently disabled by default due to lack of U-Boot support
>>>> in the mainline repository. If you wish to test this, do as follows:
>>>>
>>>> cd u-boot
>>>> git checkout some-branch-with-venice2-support
>>>> cd ../scripts
>>>> ./build --boards venice2 build
>>>
>>> Peter, do you have a Venice2 yet? If so, could I trouble you to apply
>>> the tegrarcm Tegra124 support patches from Allen, the cbootimage-configs
>>> and tegra-uboot-flasher-scripts patches from me, grab a downstream
>>> Venice2 U-Boot branch, and validate that it all works?
>>>
>>
>> It builds all fine, but flashing as such fails with:
>>
>> U-Boot SPL 2013.04-g4e07053 (Sep 13 2013 - 16:11:40)
...
>> SF: Unsupported manufacturer fc
>> Failed to initialize SPI flash at 0:0
>> No SPI flash selected. Please run `sf probe'
>> No SPI flash selected. Please run `sf probe'

Does the following solve that?

diff --git a/configs/venice2.config b/configs/venice2.config
index 15d0b67..4316a1a 100644
--- a/configs/venice2.config
+++ b/configs/venice2.config
@@ -5,4 +5,5 @@ config = {
     'flash-erase-size': 1048576,
     'flash-image': 'venice2-spi.img',
     'flash-type': 'spi',
+    'flash-id-uboot', '1:0',
 }
diff --git a/tegra-uboot-flasher b/tegra-uboot-flasher
index f1abe54..41879c3 100755
--- a/tegra-uboot-flasher
+++ b/tegra-uboot-flasher
@@ -64,7 +64,8 @@ def gen_flashcmd_nand(flash_image_addr, flash_img_size):
     return flashcmd

 def gen_flashcmd_spi(flash_image_addr, flash_img_size):
-    flashcmd = 'sf probe 0 ; '
+    flash_id = config.get('flash-id-uboot', '0')
+    flashcmd = 'sf probe %s ; ' % flash_id
     flashcmd += 'sf erase 0 0x%08x ; ' % config['flash-erase-size']
     flashcmd += 'sf write 0x%08x 0 0x%08x ; ' % (flash_image_addr,
flash_img_size)
     return flashcmd

Re: [flasher PATCH 2/2] Add config files for Venice2 board

[Stephen Warren]

On 09/13/2013 03:09 PM, Stephen Warren wrote:
> On 09/13/2013 10:19 AM, Stephen Warren wrote:
>> On 09/13/2013 07:22 AM, Peter De Schrijver wrote:
>>> On Thu, Sep 12, 2013 at 01:51:06AM +0200, Stephen Warren wrote:
>>>> On 09/11/2013 05:48 PM, Stephen Warren wrote:
>>>>> This board is currently disabled by default due to lack of U-Boot support
>>>>> in the mainline repository. If you wish to test this, do as follows:
>>>>>
>>>>> cd u-boot
>>>>> git checkout some-branch-with-venice2-support
>>>>> cd ../scripts
>>>>> ./build --boards venice2 build
...
>>> It builds all fine, but flashing as such fails with:
...
> Does the following solve that?
> 
> diff --git a/configs/venice2.config b/configs/venice2.config
> index 15d0b67..4316a1a 100644
> --- a/configs/venice2.config
> +++ b/configs/venice2.config
> @@ -5,4 +5,5 @@ config = {
>      'flash-erase-size': 1048576,
>      'flash-image': 'venice2-spi.img',
>      'flash-type': 'spi',
> +    'flash-id-uboot', '1:0',

I have applied/pushed the original two patches, with this fix squashed
in, plus fixed the syntax error in the line above; the first comma
should be a colon.