[U-Boot] [PATCH 2/2] arm: socfpga: Enable part command and EFI partition support for DE0-nano-SoC

[Marek Vasut]

On 03/05/2017 07:37 PM, Frank Kunz wrote:
> Am 05.03.2017 um 18:17 schrieb Marek Vasut:
>> On 03/05/2017 01:54 PM, Frank Kunz wrote:
>>> Those features are used by distro boot with efi boot.
>>>
>>> Signed-off-by: Frank Kunz <mailinglists at kunz-im-inter.net>
>>> ---
>>> :100644 100644 b122135690... c22b54b48d... M
>>> configs/socfpga_de0_nano_soc_defconfig
>>>  configs/socfpga_de0_nano_soc_defconfig | 7 ++++---
>>>  1 file changed, 4 insertions(+), 3 deletions(-)
>>>
>>> diff --git a/configs/socfpga_de0_nano_soc_defconfig
>>> b/configs/socfpga_de0_nano_soc_defconfig
>>> index b122135690..c22b54b48d 100644
>>> --- a/configs/socfpga_de0_nano_soc_defconfig
>>> +++ b/configs/socfpga_de0_nano_soc_defconfig
>>> @@ -4,11 +4,11 @@ CONFIG_SYS_MALLOC_F_LEN=0x2000
>>>  CONFIG_TARGET_SOCFPGA_TERASIC_DE0_NANO=y
>>>  CONFIG_SPL_STACK_R_ADDR=0x00800000
>>>  CONFIG_DEFAULT_DEVICE_TREE="socfpga_cyclone5_de0_nano_soc"
>>> -CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_nano_soc.dtb"
>>>  CONFIG_FIT=y
>>>  CONFIG_SYS_CONSOLE_IS_IN_ENV=y
>>>  CONFIG_SYS_CONSOLE_OVERWRITE_ROUTINE=y
>>>  CONFIG_SYS_CONSOLE_ENV_OVERWRITE=y
>>> +CONFIG_DEFAULT_FDT_FILE="socfpga_cyclone5_de0_nano_soc.dtb"
>>
>> Is this move needed ? (no, it's not)
>
> It is not needed, but "make savedefconfig" decided to do that. I do not
> know how to overcome it.

Try git checkout -p to selectively clear bits from the changes.
Or git add -p ...

>>
>>>  CONFIG_VERSION_VARIABLE=y
>>>  # CONFIG_DISPLAY_BOARDINFO is not set
>>>  CONFIG_SPL=y
>>> @@ -21,6 +21,7 @@ CONFIG_CMD_ASKENV=y
>>>  CONFIG_CMD_GREPENV=y
>>>  # CONFIG_CMD_FLASH is not set
>>>  CONFIG_CMD_MMC=y
>>> +CONFIG_CMD_PART=y
>>>  CONFIG_CMD_SF=y
>>>  CONFIG_CMD_SPI=y
>>>  CONFIG_CMD_I2C=y
>>> @@ -37,6 +38,8 @@ CONFIG_CMD_EXT4_WRITE=y
>>>  CONFIG_CMD_FAT=y
>>>  CONFIG_CMD_FS_GENERIC=y
>>>  CONFIG_CMD_UBI=y
>>> +CONFIG_EFI_PARTITION=y
>>> +# CONFIG_SPL_EFI_PARTITION is not set
>>>  CONFIG_SPL_DM=y
>>>  CONFIG_DFU_MMC=y
>>>  CONFIG_DM_GPIO=y
>>> @@ -59,5 +62,3 @@ CONFIG_G_DNL_MANUFACTURER="terasic"
>>>  CONFIG_G_DNL_VENDOR_NUM=0x0525
>>>  CONFIG_G_DNL_PRODUCT_NUM=0xa4a5
>>>  CONFIG_USE_TINY_PRINTF=y
>>> -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_USE_PARTITION_TYPE=y
>>> -CONFIG_SYS_MMCSD_RAW_MODE_U_BOOT_PARTITION_TYPE=0xa2
>>
>> +CC Dalon ...
>
> Similar case here. "make savedefconfig" found that those two parameters
> are already set by arch/arm/mach-socfpga/Kconfig and decided to remove
> them here, I guess.
>
>>
>>> \ No newline at end of file
>>>
>>
>>
>