On Thu, 2017-01-26 at 21:54 +0100, Marek Vasut wrote:
On 01/26/2017 09:31 PM, Dalon Westergreen wrote:
From: Dalon Westergreen dalon.westergreen@intel.com
These patches update the boot and os partition numbers in the default uboot environment for a number of socfpga boards. Per request, common environment configurations have been moved to a shared header.
Changed in v7: Changed the bootloader partition to 3 to match the default layout for socfpga. commit 61520ac4d5545cc8d2e1792092e46ab8043d5f36 changed this to 1 which broke a number of socfpga kits.
And this commit will break another bulk of kits, great ...
I think the only kit that MAY be affected is the DE1 kit and I actually dont even think that is true b/c they are probably using the method described in the former thread where they just write the u-boot-with-spl.sfp to +64KB. CONFIG_SPL_ABORT_ON_RAW_IMAGE is defined for the board. If i had a board I would test it. But that said, this is currently how all of the altera kits, and the de0 kit work.
The default sdcard layour places partition 3 at the start of the fpga at +1MB. The partition is of type 0xA2. This is followed by partition 1 (FAT), and partition 2 (RootFS). Partition 1 should be the FAT partition or windows appears not to recognize the sdcard.
Isn't this fixing problems at the wrong place ? Maybe Microsoft should fix their OS instead ...
Agreed, but i have no control of that, and am certainly not a user....
I would love to know how best to proceed, i can tell you the 2017.01 tag does not boot my altera boards.
--dalon
Changed in v6: Changed CONFIG_SYS_MMCSD_FS_BOOT_PARTITION to be 1 for SPL_FAT and 2 for SPL_EXT support. I believe this is the original intent for whomever changed CONFIG_SYS_MMCSD_FS_BOOT_PARTITION to be 2. This allows us to keep the original sdcard layout and support FAT and EXT loading of the u-boot image Changes in v5: - Fixed sockit linux devicetree name - Changed default socfpga.dtb to match board name - sr1500 -> socfpga_cyclone5_sr1500.dtb - de1 -> socfpga_cyclone5_de1_soc.dtb Changes in v4: - Removed extraneous define in socfpga_common.h and only use CONFIG_EXTRA_ENV_SETTINGS for common uboot environment Changes in v3: - Corrected error in common default environment
Dalon Westergreen (7): arm: socfpga: add env settings to common header arm: socfpga: update de0 nano default environment arm: socfpga: update cyclone5 socdk default environment arm: socfpga: update arria5 socdk default environment arm: socfpga: Update DE1 environment arm: socfpga: Update SoCKit environment arm: socfpga: Update sr1500 environment
configs/socfpga_arria5_defconfig | 1 + configs/socfpga_cyclone5_defconfig | 1 + configs/socfpga_de0_nano_soc_defconfig | 3 +-- configs/socfpga_de1_soc_defconfig | 1 + configs/socfpga_sockit_defconfig | 1 + configs/socfpga_sr1500_defconfig | 1 + include/configs/socfpga_arria5_socdk.h | 25 ----------------------- include/configs/socfpga_common.h | 35 ++++++++++++++++++++++++++++++-- include/configs/socfpga_cyclone5_socdk.h | 25 ----------------------- include/configs/socfpga_de0_nano_soc.h | 19 +---------------- include/configs/socfpga_de1_soc.h | 19 +---------------- include/configs/socfpga_sockit.h | 27 +----------------------- include/configs/socfpga_sr1500.h | 25 ----------------------- 13 files changed, 42 insertions(+), 141 deletions(-)