Merge branch 'for-next/mips'

Merge branch 'for-next/elf'

kbuild: fix typo in --no-whole-archive flag ...

"whole" was replaced with "while" during a previous patch. Fix this flag
to allow building correctly.

Fixes 0a78b33954 ("kbuild: switch over to thin archive")
Signed-off-by: Clement Leger <cleger@kalray.eu>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MIPS: AR9331: OKUD Max9331 ...

Oleksij and Kevin's Useless Devices.
        O&KUD Max9331

 AR9331 400MHz MIPS
   64M DRAM
   16M SPI Flash
    4G USB Nand Flash
     3 User LEDs
     3 Ports(1Wan/2Lan)
     1 TTL Debug Uart

Signed-off-by: Du Huanpeng <u74147@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mips: lib: bootm: use bootm elf loading capabilities ...

Now that the elf file is loaded by the bootm core, there is no need for
elf pointer anymore. Thus all elf related fields can be removed and
bootm_load_os can be used.

Signed-off-by: Clement Leger <cleger@kalray.eu>
Tested-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

common: elf: add elf_open, elf_close and elf_load ...

In order to integrate elf loading into bootm command, split elf opening
from elf loading.

Signed-off-by: Clement Leger <cleger@kalray.eu>
Tested-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

common: elf: load elf directly from file ...

Currently, elf file must be loaded into a buffer and then passed to
elf_load_image. This requires to copy the whole elf file before booting
it. This commit allows to pass the filename directly and will allocate
data only for the elf header (elf header + program headers). This will
then be used to load the elf data from the file without copying it in an
intermediate buffer. Elf segments are first parsed into a list and are
then loaded from the file in a second time.

Signed-off-by: Clement Leger <cleger@kalray.eu>
Tested-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/misc'

MIPS: correctly work with disabled CONFIG_MMU ...

There are some issues with CONFIG_MMU=n in MIPS configuration
(e.g. qemu-malta_defconfig):

  * "Cannot request SDRAM region for stack" error message on start;
  * empty kseg1_ram0 region in the iomem command output.

The patch fixes the problems by forcing KSEG1 memory region usage
for CONFIG_MMU=n MIPS configurations.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

kbuild: switch over to thin archive ...

Starting v4.13, Linux always uses thin archive instead of relocatable
ELF to combine builtin objects.

The thin archive is basically a text file that only contains paths to
object files.

As Linux commit 98ced886dd79 mentioned, this has a lot of benefits:

 - save disk space for builds

 - speed-up building a little

 - fix some issues when liking a giant executable (for example,
   allyesconfig on ARM Linux)

 - work better with dead code elimination

The last one is important for barebox because pbl highly relies on the
dead code elimination (-f{function,data}-sections and --gc-sections)
dropping symbols that are unreachable from the linker's entry point.
The dead code elimination does not work if the same symbol names are
used in the pevious incremental link mechanism because the same name
symbols all go into the same section.

Commit a83c97f2a406 ("ARM: socfpga: generate smaller images when
multiple boards are selected") worked around it by giving a dedicate
section to each of the same name symbols. This workaround can go away.

built-in.o was renamed to built-in.a since it is now an archive.
built-in-pbl.o was renamed to built-in.pbl.a for consistency.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

kbuild: remove obj-dtb-y, pbl-dtb-y, lwl-dtb-y syntax ...

The embedded DTBs are compiled by the chain of pattern rules as follows:

  %.dts -> %.dtb -> %.dtb.S -> %.dtb.o       for barebox proper
  %.dts -> %.dtb -> %.dtb.S -> %.dtb.pbl.o   for pbl

Barebox introduced {obj,pbl,lwl}-dtb-y syntax to put the intermediate
files into extra-y. The purposes of doing so were:

 [1] prevent GNU Make from deleting the intermediate files
 [2] include .*.cmd files

In contrast, Linux does not use a special syntax for embedding DTBs
into the kernel.

For example, as you see in arch/sh/boot/dts/Makefile of Linux 5.6,

   obj-y += <basename>.dtb.o

... just works.

This is because scripts/Kbuild.include specifies .SECONDARY to cater
to [1], and scripts/Makefile.build adds the intermediates to 'targets'
to deal with [2].

Barebox had already imported the same code from Linux, so you can use
obj-y instead of obj-dtb-y, like Linux.

pbl-dtb-y and lwl-dtb-y are barebox-specific cases, so I added the
%.dtb.pbl.o pattern to intermediate_targets.

Going forward, please use obj-y, pbl-y, or lwl-y.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/misc'

Merge branch 'for-next/kconfig'

arch: remove KBUILD_SRC checks from arch Makefile ...

You can always add $(srctree)/ to the mach include path.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MIPS: dlink-dir-320: remove useless board file ...

The board file calls only barebox_set_hostname().
Since we can extract host name from devicetree,
we can drop board file.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mips: remove unused board/debug_ll.h ...

There is no way to include <board/debug_ll.h>. These three files
are dead code.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mips: remove unused INCDIR and BOARD variables in Makefile ...

The variable INCDIR is not used by anyone.

The variable BOARD is not set by anyone, so $(BOARD) is always empty.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MIPS: ath79: define used, but undefined, Kconfig option ...

SOC_QCA_QCA4531 is selected, but defined no where. fix this.

Cc: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Ahmad Fatoum <ahmad@a3f.at>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

kbuild: prefix compiler flag variables with KBUILD_ ...

In old days, Linux also used to use well-known variables such CFLAGS,
CPPFLAGS, etc.

They were prefixed with KBUILD_ presumably for preventing users from
overriding them accidentally.

Rename as follows:
  CFLAGS          ->  KBUILD_CFLAGS
  AFLAGS          ->  KBUILD_AFLAGS
  CPPFLAGS        ->  KBUILD_CPPFLAGS
  LDFLAGS         ->  KBUILD_LDFLAGS
  HOSTCFLAGS      ->  KBUILD_HOSTCFLAGS
  HOSTCXXFLAGS    ->  KBUILD_HOSTCXXFLAGS
  HOSTLDFLAGS     ->  KBUILD_HOSTLDFLAGS
  HOST_LOADLIBES  ->  KBUILD_HOSTLDLIBS

HOSTCFLAGS, HOSTCXXFLAGS, HOSTLDFLAGS, HOSTLDLIBS are re-used to allow
users to pass-in additional flags to the host compiler.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

mips: rename ldflags-y to mips-ldflags-y ...

The next commit will add ldflags-y to scripts/Makefile.lib like Linux,
but barebox includes scripts/Makefile.lib from the top Makefile.

arch/mips/Makefile uses ldflags-y for a different meaning.

To avoid unpleasant side-effect, this commit rename it.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/misc'

kbuild: rename barebox-{common, lds} to BAREBOX_{OBJS, LDS} ...

The previous commit renamed barebox-pbl-common because you cannot
export a variable that contain hyphens.

These variables are not exported for now. I am just renaming them for
consistency.

  barebox-common -> BAREBOX_OBJS
  barebox-lds    -> BAREBOX_LDS

If barebox moves the link rules into scripts/link-barebox.sh like
Linux did, these two must be exported anyway.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

kbuild: rename barebox-pbl-common to BAREBOX_PBL_OBJS ...

'export barebox-pbl-common' does not work reliably because hyphens
are disallowed in shell variables.

This caused a problem in Linux in the past. See Linux commit 2bfbe7881ee0
("kbuild: Do not use hyphen in exported variable name").

The same problem occurs when you build barebox with O= and the directory
path to the source tree contains a shell special character like '~'.

The maintainer of GNU Make stated that there is no consistent way to
export variables that do not meet the shell's naming criteria.
(https://savannah.gnu.org/bugs/?55719)

Consequently, you cannot use hyphens in exported variables.

Rename barebox-pbl-common to BAREBOX_PBL_OBJS.

I named it after KBUILD_VMLINUX_OBJS in the Linux top Makefile.

Signed-off-by: Masahiro Yamada <masahiroy@kernel.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MIPS: ath79: add support for OpenEmbed SOM9331 board ...

Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

Merge branch 'for-next/misc'

images: Use separate LDFLAGS for PBL ...

When setting CONFIG_PBL_RELOCATABLE=y (selected by PBL_MULTI_IMAGES) and
CONFIG_RELOCATABLE=n (trying to reduce image size), the PBL is also
linked with "-static" instead of "-pie". The result is a non-working
PBL.

As a side effect, also get rid of erroneous "-Map barebox.map" when
linking the PBL.

Only changed for ARM, are any other platforms affected?

Signed-off-by: Christian Eggers <ceggers@arri.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MIPS: don't overlay relocation data with BSS ...

.bss __rel_start (OVERLAY) was used to optimize RAM size used by
barebox. Since .bss and __rel_start overlap, we should clear bss only
after __rel_start was used. Following patch changed initialization
sequence to clear .bss before __rel_start:
1e5aef61fc6a444 ("MIPS: reloc: init bss and cpu")

This make relocation buffer unusable and broke relocation with different
symptoms reported by Antony Pavlov <antonynpavlov@gmail.com>:
  * iomem output has no information on sdram regions, so memtest is unusable;
  * pc = 0xa081232c, relocation does not work, barebox is located with 8M offset
    from start of RAM. The board has 256M and relocation routine
    should move barebox code much higher;
  * pc = 0xa081232c, so barebox code works from KSEG1 not from KSEG0 as MMU=y option implies.

There is a choice of moving .bss clear sequence after __rel_start or
remove this optimization. Since the use of this optimization is minimal
and danger to trap in to similar issue is still high, i prefer to remove
this optimization.

As result of this change, we need to fix calculation of relocation are
size:
relocate_code() calculates relocation area size as a sum (barebox_image_size +
bss_len). barebox_image_size and bss_len are calculated as (__image_end -
__image_start) and (__bss_stop - __bss_start) respectively. This doesn't take
into account relocation data placed between  __image_end and __bss_start.
However relocation preserves BSS position relative to image start, as if
relocation data is still there. This causes RAM overflow during BSS
initialization in main_entry(). This problem may be hidden due to the alignment
of the `relocaddr`.

Reported-by: Antony Pavlov <antonynpavlov@gmail.com>
Fixes: 1e5aef61fc6a444 ("MIPS: reloc: init bss and cpu")
Signed-off-by: Oleksij Rempel <o.rempel@pengutronix.de>
Signed-off-by: Peter Mamonov <pmamonov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MIPS: actually use CONFIG_MIPS_RELOCATION_TABLE_SIZE ...

The commit 28ed10d6a67c9 ("MIPS: relocation: add relocation support")
introduce the Kconfig CONFIG_MIPS_RELOCATION_TABLE_SIZE parameter
but it is never used.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MIPS: dts: rename tplink-mr3020.dts -> ar9331_tl_mr3020.dts ...

Linux MIPS uses <soc-name>_<board-name>.dts board dts-file
naming scheme so use it in barebox too.

Signed-off-by: Antony Pavlov <antonynpavlov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>

MIPS: loongson: rename CPU_LOONGSON1 to CPU_GS232 ...

The CPU in the loongson 1b SoC is called GS232.
Here is some active chips and it's core:

NAME              CPU       Core(s)
The loongson 3 series/server & desktop
  3A3000/3B3000     GS464E    64bit x4
  3A2000/3B2000     GS464E    64bit x4
  3B1500            GS464     64bit x8
  3A1000            GS464     64bit x4

The loongson 2 series/low power
  2K1000            GS264     64bit x2
  2F                GS464     64bit x1
  2H                GS464     64bit x1

The loongson 1 series/embeded
  1C101             GS132R    32bit ?
  1D                GS132     32bit ?
  1C                GS232     32bit x1
  1B                GS232     32bit x1
  1A                GS232     32bit x1

see:
[1] http://www.loongson.cn/product/

Signed-off-by: Du Huanpeng <duhuanpeng@loongson.cn>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>