Eric Lee / smarc-uboot

24 Feb, 2018

1 commit

  • d021e9421   Convert CONFIG_BOOTP_BOOTPATH et al to Kconfig ... Browse Code »

    This converts the following to Kconfig:
    CONFIG_BOOTP_BOOTPATH
    CONFIG_BOOTP_DNS
    CONFIG_BOOTP_GATEWAY
    CONFIG_BOOTP_HOSTNAME
    CONFIG_BOOTP_PXE
    CONFIG_BOOTP_SUBNETMASK
    CONFIG_CMDLINE_EDITING
    CONFIG_AUTO_COMPLETE
    CONFIG_SYS_LONGHELP
    CONFIG_SUPPORT_RAW_INITRD
    CONFIG_ENV_VARS_UBOOT_CONFIG

    Signed-off-by: Adam Ford
    [trini: Re-run the migration]
    Signed-off-by: Tom Rini

    Adam Ford
     

11 Feb, 2018

1 commit

  • 278b90ce7   configs: Migrate CONFIG_SYS_TEXT_BASE ... Browse Code »
    15

    On the NIOS2 and Xtensa architectures, we do not have
    CONFIG_SYS_TEXT_BASE set. This is a strict migration of the current
    values into the defconfig and removing them from the headers.

    I did not attempt to add more default values in and for now will leave
    that to maintainers.

    Signed-off-by: Tom Rini

    Tom Rini
     

02 Feb, 2018

2 commits

23 Jan, 2018

1 commit

10 Jan, 2018

1 commit

  • cfb8462aa   ARM: Drop unreferenced CONFIG_MACH_* defines ... Browse Code »

    These macros are all defined once and never checked or used anywhere:

    CONFIG_MACH_ASPENITE
    CONFIG_MACH_DAVINCI_CALIMAIN
    CONFIG_MACH_DOCKSTAR
    CONFIG_MACH_EDMINIV2
    CONFIG_MACH_GOFLEXHOME
    CONFIG_MACH_GONI
    CONFIG_MACH_GURUPLUG
    CONFIG_MACH_KM_KIRKWOOD
    CONFIG_MACH_OPENRD_BASE
    CONFIG_MACH_SHEEVAPLUG

    Almost all of them were only used for the mach_is_foo() logic in
    arch/arm/asm/mach-types.h that were dropped in
    commit f9dadaef8b75fa ("arm: Re-sync asm/mach-types.h with
    Linux Kernel v4.9")

    Signed-off-by: Tuomas Tynkkynen

    Tuomas Tynkkynen
     

17 Nov, 2017

1 commit

  • 232ed3ca5   arm: config: fix default console only to specify the device ... Browse Code »
    14

    Since CONFIG_DEFAULT_CONSOLE is already started with "console=",
    the console argument in CONFIG_EXTRA_ENV_SETTINGS is expanded to
    "console=console=ttySAC1,115200n8" and this causes the wrong
    console device.

    #define CONFIG_DEFAULT_CONSOLE "console=ttySAC1,115200n8\0"
    ...
    #define CONFIG_EXTRA_ENV_SETTINGS \
    "console=" CONFIG_DEFAULT_CONSOLE

    Signed-off-by: Dongjin Kim
    Reviewed-by: Simon Glass

    Dongjin Kim
     

06 Nov, 2017

1 commit

04 Sep, 2017

3 commits

  • e090579d0   include/configs: remove numerous CONFIG_SYS_BARGSIZE definitions ... Browse Code »

    This commit removes definitions of CONFIG_SYS_BARGSIZE defined to be
    equal to CONFIG_SYS_CBSIZE in numerous configuration files.

    We remove such definitions in two situations:

    - CONFIG_SYS_CBSIZE is otherwise not defined in the board
    configuration file, which means the default value of
    CONFIG_SYS_CBSIZE == 256 applies. In this case, the default value
    of CONFIG_SYS_BARGSIZE == 512 (common/image.c) is suitable, as it is
    larger.

    - CONFIG_SYS_CBSIZE is defined in the board configuration file, but
    to a value equal or less than 512. In this case, the default value
    of CONFIG_SYS_BARGSIZE == 512 (common.image.c) is suitable, as it
    is equal or larger.

    Signed-off-by: Thomas Petazzoni
    Reviewed-by: Tom Rini

    Thomas Petazzoni
     
  • 1f20fc53b   include/configs: drop default definitions of CONFIG_SYS_MAXARGS ... Browse Code »

    Now that include/config_fallbacks.h define a sane fallback for
    CONFIG_SYS_MAXARGS, we can drop the definition of this constant in all
    configurations that were using the default value.

    Signed-off-by: Thomas Petazzoni
    Reviewed-by: Tom Rini

    Thomas Petazzoni
     
  • 3784c789e   include/configs: remove CONFIG_SYS_CBSIZE when the default value is used ... Browse Code »

    Now that include/config_fallbacks.h define a sane fallback for
    CONFIG_SYS_CBSIZE, we can drop the definition of this constant in all
    configurations that were using the default value.

    Signed-off-by: Thomas Petazzoni
    Reviewed-by: Tom Rini
    [trini: Drop from stih410-b2260.h]
    Signed-off-by: Tom Rini

    Thomas Petazzoni
     

15 Aug, 2017

1 commit

12 Aug, 2017

2 commits

26 Jul, 2017

1 commit

  • 2be296538   Convert CONFIG_ENV_IS_IN_MMC/NAND/UBI and NOWHERE to Kconfig ... Browse Code »
    20

    This converts the following to Kconfig:
    CONFIG_ENV_IS_IN_MMC
    CONFIG_ENV_IS_IN_NAND
    CONFIG_ENV_IS_IN_UBI
    CONFIG_ENV_IS_NOWHERE

    In fact this already exists for sunxi as a 'choice' config. However not
    all the choices are available in Kconfig yet so we cannot use that. It
    would lead to more than one option being set.

    In addition, one purpose of this series is to allow the environment to be
    stored in more than one place. So the existing choice is converted to a
    normal config allowing each option to be set independently.

    There are not many opportunities for Kconfig updates to reduce the size of
    this patch. This was tested with

    ./tools/moveconfig.py -i CONFIG_ENV_IS_IN_MMC

    And then manual updates. This is because for CHAIN_OF_TRUST boards they
    can only have ENV_IS_NOWHERE set, so we enforce that via Kconfig logic
    now.

    Signed-off-by: Simon Glass
    Signed-off-by: Tom Rini

    Simon Glass
     

23 Jul, 2017

1 commit

  • f3603b438   powerpc: Remove unneccessary #ifdefs in reginfo ... Browse Code »

    reginfo command is calling mpc8xx_reginfo(), mpc85xx_reginfo()
    or mpc86xx_reginfo() based on CONFIG_ symbol.
    As those 3 functions can't me defined at the same time, let's
    rename them print_reginfo() to avoid the #ifdefs
    The name is kept generic as it is not at all dependent on
    powerpc arch and any other arch could want to also print
    such information.

    In addition, as the Makefile compiles cmd/reginfo.c only when
    CONFIG_CMD_REGINFO is set, there is no need to enclose the U_BOOT_CMD
    definition inside a #ifdef CONFIG_CMD_REGINFO

    Lets all remove the #ifdefs around the U_BOOT_CMD as this
    file is only compiled when CONFIG_CMD_REGINFO is defined

    Finally, this is a PowerPC-only command, disable it on a number of
    non-PowerPC platforms.

    Signed-off-by: Christophe Leroy
    Signed-off-by: Tom Rini

    Christophe Leroy
     

04 Jun, 2017

1 commit

  • 91d27a17c   Kconfig: Migrate FS_FAT / FAT_WRITE ... Browse Code »

    Now that these symbols are in Kconfig, migrate all users. Use imply on
    a number of platforms that default to having this enabled. As part of
    this we must migrate some straglers for CMD_FAT and DOS_PARTITION.

    Signed-off-by: Tom Rini

    Tom Rini
     

20 Mar, 2017

1 commit

13 Feb, 2017

1 commit

  • e856bdcfb   flash: complete CONFIG_SYS_NO_FLASH move with renaming ... Browse Code »
    20

    We repeated partial moves for CONFIG_SYS_NO_FLASH, but this is
    not completed. Finish this work by the tool.

    During this move, let's rename it to CONFIG_MTD_NOR_FLASH.
    Actually, we have more instances of "#ifndef CONFIG_SYS_NO_FLASH"
    than those of "#ifdef CONFIG_SYS_NO_FLASH". Flipping the logic will
    make the code more readable. Besides, negative meaning symbols do
    not fit in obj-$(CONFIG_...) style Makefiles.

    This commit was created as follows:

    [1] Edit "default n" to "default y" in the config entry in
    common/Kconfig.

    [2] Run "tools/moveconfig.py -y -r HEAD SYS_NO_FLASH"

    [3] Rename the instances in defconfigs by the following:
    find . -path './configs/*_defconfig' | xargs sed -i \
    -e '/CONFIG_SYS_NO_FLASH=y/d' \
    -e 's/# CONFIG_SYS_NO_FLASH is not set/CONFIG_MTD_NOR_FLASH=y/'

    [4] Change the conditionals by the following:
    find . -name '*.[ch]' | xargs sed -i \
    -e 's/ifndef CONFIG_SYS_NO_FLASH/ifdef CONFIG_MTD_NOR_FLASH/' \
    -e 's/ifdef CONFIG_SYS_NO_FLASH/ifndef CONFIG_MTD_NOR_FLASH/' \
    -e 's/!defined(CONFIG_SYS_NO_FLASH)/defined(CONFIG_MTD_NOR_FLASH)/' \
    -e 's/defined(CONFIG_SYS_NO_FLASH)/!defined(CONFIG_MTD_NOR_FLASH)/'

    [5] Modify the following manually
    - Rename the rest of instances
    - Remove the description from README
    - Create the new Kconfig entry in drivers/mtd/Kconfig
    - Remove the old Kconfig entry from common/Kconfig
    - Remove the garbage comments from include/configs/*.h

    Signed-off-by: Masahiro Yamada

    Masahiro Yamada
     

31 Jan, 2017

1 commit

  • 54925327f   mmc: move CONFIG_GENERIC_MMC to Kconfig ... Browse Code »
    40

    Now, CONFIG_GENERIC_MMC seems equivalent to CONFIG_MMC.

    Let's create an entry for "config GENERIC_MMC" with "default MMC",
    then convert all macro defines in headers to Kconfig. Almost all
    of the defines will go away.

    I see only two exceptions:
    configs/blanche_defconfig
    configs/sandbox_noblk_defconfig

    They define CONFIG_GENERIC_MMC, but not CONFIG_MMC. Something
    might be wrong with these two boards, so should be checked later.

    Anyway, this is the output of the moveconfig tool.

    This commit was created as follows:

    [1] create a config entry in drivers/mmc/Kconfig

    [2] tools/moveconfig.py -r HEAD GENERIC_MMC

    [3] manual clean-up of garbage comments in doc/README.* and
    include/configs/*.h

    Signed-off-by: Masahiro Yamada
    Reviewed-by: Tom Rini

    Masahiro Yamada
     

28 Jan, 2017

3 commits

30 Dec, 2016

3 commits

  • 45a68fe26   mmc: move some SDHCI related options to Kconfig ... Browse Code »

    While I moved the options, I also renamed them so that they are all
    prefixed with MMC_SDHCI_.

    This commit was created in the following steps.

    [1] Rename with the following command
    find . -name .git -prune -o ! -path ./scripts/config_whitelist.txt \
    -type f -print | xargs sed -i -e '
    s/CONFIG_MMC_SDMA/CONFIG_MMC_SDHCI_SDMA/g
    s/CONFIG_BCM2835_SDHCI/CONFIG_MMC_SDHCI_BCM2835/g
    s/CONFIG_KONA_SDHCI/CONFIG_MMC_SDHCI_KONA/g
    s/CONFIG_MV_SDHCI/CONFIG_MMC_SDHCI_MV/g
    s/CONFIG_S5P_SDHCI/CONFIG_MMC_SDHCI_S5P/g
    s/CONFIG_SPEAR_SDHCI/CONFIG_MMC_SDHCI_SPEAR/g
    '

    [2] create the Kconfig entries in drivers/mmc/Kconfig

    [3] Move the options by the following command
    tools/moveconfig.py -y MMC_SDHCI_SDMA MMC_SDHCI_BCM2835 \
    MMC_SDHCI_KONA MMC_SDHCI_MV MMC_SDHCI_S5P MMC_SDHCI_SPEAR

    [4] Sort drivers/mmc/Makefile for readability

    Signed-off-by: Masahiro Yamada
    Reviewed-by: Tom Rini
    Reviewed-by: Jaehoon Chung

    Masahiro Yamada
     
  • e1ce61fbb   mmc: move CONFIG_SDHCI to Kconfig, renaming to CONFIG_MMC_SDHCI ... Browse Code »

    Move CONFIG_SDHCI to Kconfig and rename it to CONFIG_MMC_SDHCI.
    My motivation for the rename is, ultimately, to make all the MMC
    options prefixed with MMC_ and SDHCI options with MMC_SDHCI_,
    like Linux.

    This commit was created as follows:

    [1] Rename the config option with the following command:
    find . -name .git -prune -o ! -path ./scripts/config_whitelist.txt \
    -type f -print | xargs sed -i -e 's/CONFIG_SDHCI/CONFIG_MMC_SDHCI/g'

    [2] create the entry for MMC_SDHCI in drivers/mmc/Kconfig

    [3] run "tools/moveconfig.py -y MMC_SDHCI"

    [4] add "depends on MMC_SDHCI" to existing SDHCI driver entries

    Signed-off-by: Masahiro Yamada
    Reviewed-by: Tom Rini
    Reviewed-by: Jaehoon Chung

    Masahiro Yamada
     
  • c27269953   mmc: complete unfinished move of CONFIG_MMC ... Browse Code »
    26

    Commit 7a777f6d6f35 ("mmc: Add generic Kconfig option") created
    a Kconfig entry for this option without any actual moves, then
    commit 44c798799f66 ("sunxi: Use Kconfig CONFIG_MMC") moved
    instances only for SUNXI.

    We generally do not like such partial moves. This kind of work
    is automated by tools/moveconfig.py, so it is pretty easy to
    complete this move.

    I am adding "default ARM || PPC || SANDBOX" (suggested by Tom).
    This shortens the configs and will ease new board porting.

    This commit was created as follows:

    [1] Edit Kconfig (remove the "depends on", add the "default",
    copy the prompt and help message from Linux)

    [2] Run 'tools/moveconfig.py -y -s -r HEAD MMC'

    Signed-off-by: Masahiro Yamada
    Reviewed-by: Jaehoon Chung

    Masahiro Yamada
     

05 Dec, 2016

1 commit

24 Oct, 2016

1 commit

12 Oct, 2016

2 commits

27 Sep, 2016

1 commit

  • 6828e602b   dfu: Migrate to Kconfig ... Browse Code »
    14

    Introduce a hidden USB_FUNCTION_DFU Kconfig option and select it for
    CMD_DFU (as we must have the DFU command enabled to do anything DFU).
    Make all of the entries in drivers/dfu/Kconfig depend on CMD_DFU and add
    options for all of the back end choices that DFU can make use of.

    Cc: Lukasz Majewski
    Signed-off-by: Tom Rini
    Acked-by: Lukasz Majewski

    Tom Rini
     

27 Aug, 2016

1 commit

  • 067716bac   ARM: Move SYS_CACHELINE_SIZE over to Kconfig ... Browse Code »

    This series moves the CONFIG_SYS_CACHELINE_SIZE. First, in nearly all
    cases we are mirroring the values used by the Linux Kernel here. Also,
    so long as (and in this case, it is true) we implement flushes in hunks
    that are no larger than the smallest implementation (and given that we
    mirror the Linux Kernel, again we are fine) it is OK to align higher.
    The biggest changes here are that we always use 64 bytes for CPU_V7 even
    if for example the underlying core is only 32 bytes (this mirrors
    Linux). Second, we say ARM64 uses 64 bytes not 128 (as found in the
    Linux Kernel) as we do not need multi-platform support (to this degree)
    and only the Cavium ThunderX 88xx series has a use for such large
    alignment.

    Cc: Albert Aribaud
    Cc: Marek Vasut
    Cc: Stefano Babic
    Cc: Prafulla Wadaskar
    Cc: Luka Perkov
    Cc: Stefan Roese
    Cc: Nagendra T S
    Cc: Vaibhav Hiremath
    Acked-by: Lokesh Vutla
    Cc: Steve Rae
    Cc: Igor Grinberg
    Cc: Nikita Kiryanov
    Cc: Stefan Agner
    Acked-by: Heiko Schocher
    Cc: Mateusz Kulikowski
    Cc: Peter Griffin
    Acked-by: Paul Kocialkowski
    Cc: Anatolij Gustschin
    Acked-by: "Pali Rohár"
    Cc: Adam Ford
    Cc: Steve Sakoman
    Cc: Grazvydas Ignotas
    Cc: Nishanth Menon
    Cc: Stephen Warren
    Cc: Robert Baldyga
    Cc: Minkyu Kang
    Cc: Thomas Weber
    Cc: Masahiro Yamada
    Cc: David Feng
    Cc: Alison Wang
    Cc: Michal Simek
    Cc: Simon Glass
    Cc: York Sun
    Cc: Shengzhou Liu
    Cc: Mingkai Hu
    Cc: Prabhakar Kushwaha
    Cc: Aneesh Bansal
    Cc: Saksham Jain
    Cc: Qianyu Gong
    Cc: Wang Dongsheng
    Cc: Alex Porosanu
    Cc: Hongbo Zhang
    Cc: tang yuantian
    Cc: Rajesh Bhagat
    Cc: Josh Wu
    Cc: Bo Shen
    Cc: Viresh Kumar
    Cc: Hannes Schmelzer
    Cc: Thomas Chou
    Cc: Joe Hershberger
    Cc: Sam Protsenko
    Cc: Bin Meng
    Cc: Christophe Ricard
    Cc: Anand Moon
    Cc: Beniamino Galvani
    Cc: Carlo Caione
    Cc: huang lin
    Cc: Sjoerd Simons
    Cc: Xu Ziyuan
    Cc: "jk.kernel@gmail.com"
    Cc: "Ariel D'Alessandro"
    Cc: Kever Yang
    Cc: Samuel Egli
    Cc: Chin Liang See
    Cc: Dinh Nguyen
    Cc: Hans de Goede
    Cc: Ian Campbell
    Cc: Siarhei Siamashka
    Cc: Boris Brezillon
    Cc: Andre Przywara
    Cc: Bernhard Nortmann
    Cc: Wolfgang Denk
    Cc: Ben Whitten
    Cc: Tom Warren
    Cc: Alexander Graf
    Cc: Sekhar Nori
    Cc: Vitaly Andrianov
    Cc: "Andrew F. Davis"
    Cc: Murali Karicheri
    Cc: Carlos Hernandez
    Cc: Ladislav Michl
    Cc: Ash Charles
    Cc: Mugunthan V N
    Cc: Daniel Allred
    Cc: Gong Qianyu
    Signed-off-by: Tom Rini
    Acked-by: Masahiro Yamada
    Acked-by: Chin Liang See
    Tested-by: Stephen Warren
    Acked-by: Paul Kocialkowski

    Tom Rini
     

02 Jul, 2016

1 commit

  • 2fbb8462b   autoboot: remove CONFIG_ZERO_BOOTDELAY_CHECK ... Browse Code »

    As the help message of CONFIG_BOOTDELAY says, CONFIG_BOOTDELAY=-2
    means the autoboot with no delay, with no abort check even if
    CONFIG_ZERO_BOOTDELAY_CHECK is defined.

    To sum up, the autoboot behaves as follows:

    [1] CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=y
    autoboot with no delay, but you can abort it by key input

    [2] CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=n
    autoboot with no delay, with no check for abort

    [3] CONFIG_BOOTDELAY=-1
    disable autoboot

    [4] CONFIG_BOOTDELAY=-2
    autoboot with no delay, with no check for abort

    As you notice, [2] and [4] come to the same result, which means we
    do not need CONFIG_ZERO_BOOTDELAY_CHECK. We can control all the
    cases only by CONFIG_BOOTDELAY, like this:

    [1] CONFIG_BOOTDELAY=0
    autoboot with no delay, but you can abort it by key input

    [2] CONFIG_BOOTDELAY=-1
    disable autoboot

    [3] CONFIG_BOOTDELAY=-2
    autoboot with no delay, with no check for abort

    This commit converts the logic as follow:
    CONFIG_BOOTDELAY=0 && CONFIG_ZERO_BOOTDELAY_CHECK=n
    --> CONFIG_BOOTDELAY=-2

    Signed-off-by: Masahiro Yamada
    Reviewed-by: Stefan Roese
    Acked-by: Igor Grinberg
    Reviewed-by: Simon Glass
    Acked-by: Vladimir Zapolskiy
    Reviewed-by: Heiko Schocher
    Acked-by: Christian Riesch
    Acked-by: Hannes Schmelzer

    Masahiro Yamada
     

26 Apr, 2016

2 commits

20 Apr, 2016

4 commits

26 Mar, 2016

1 commit

  • f9d0fd8a5   usb: gadget: Move CONFIG_USB_GADGET to Kconfig ... Browse Code »

    The description was borrowed from kernel. "tristate" type was changed
    to "bool" (I believe we don't support modules for u-boot yet, right?).
    CONFIG_USB_GADGET requires CONFIG_USB to be defined too, so add it along
    as well.

    Definitions were added to defconfig files in a way that
    "make savedefconfig" generates exactly the same file as used defconfig.

    Signed-off-by: Sam Protsenko
    [trini: Add zynq_zc702 conversion]
    Signed-off-by: Tom Rini

    Sam Protsenko