Update Buildroot to 2019.02.3 (#415)
* Update Buildroot to 2019-02.3 * Fix enter script * Update ova_defconfig * Fix network manager * Remove runc patches * Use same docker version * Fix build * Fix vmtools * Fix depens * Fix handling with tempfiles * Fix permission handling * Fix cp * Cleanup * Fix mounts
This commit is contained in:
Pascal Vizeli
@@ -0,0 +1,59 @@
|
||||
From 5c0a443ba336f10a8db6a99c769aa84ad37ed4d2 Mon Sep 17 00:00:00 2001
|
||||
From: Vadim Kochan <vadim4j@gmail.com>
|
||||
Date: Wed, 20 Feb 2019 02:48:43 +0200
|
||||
Subject: [PATCH] meminfo: Access to io memory via pointers
|
||||
|
||||
The main reason for this is to be able compile with musl library,
|
||||
because there is no support of inx/outx functions for ARM platform.
|
||||
|
||||
Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
|
||||
---
|
||||
meminfo.c | 11 ++++++-----
|
||||
1 file changed, 6 insertions(+), 5 deletions(-)
|
||||
|
||||
diff --git a/meminfo.c b/meminfo.c
|
||||
index 0b0ff23..7d9f10f 100644
|
||||
--- a/meminfo.c
|
||||
+++ b/meminfo.c
|
||||
@@ -22,7 +22,6 @@
|
||||
#include <sys/mman.h>
|
||||
#include <stdint.h>
|
||||
#include <errno.h>
|
||||
-#include <sys/io.h>
|
||||
#include <stdbool.h>
|
||||
|
||||
#include "common.h"
|
||||
@@ -74,24 +73,26 @@ static enum sunxi_soc_version soc_version;
|
||||
unsigned int
|
||||
sunxi_io_read(void *base, int offset)
|
||||
{
|
||||
- return inl((unsigned long) (base + offset));
|
||||
+ unsigned long port = (unsigned long) (base + offset);
|
||||
+ return *((volatile unsigned long *) port);
|
||||
}
|
||||
|
||||
void
|
||||
sunxi_io_write(void *base, int offset, unsigned int value)
|
||||
{
|
||||
- outl(value, (unsigned long) (base + offset));
|
||||
+ unsigned long port = (unsigned long) (base + offset);
|
||||
+ *((volatile unsigned long *) port) = value;
|
||||
}
|
||||
|
||||
void
|
||||
sunxi_io_mask(void *base, int offset, unsigned int value, unsigned int mask)
|
||||
{
|
||||
- unsigned int tmp = inl((unsigned long) (base + offset));
|
||||
+ unsigned int tmp = sunxi_io_read(base, offset);
|
||||
|
||||
tmp &= ~mask;
|
||||
tmp |= value & mask;
|
||||
|
||||
- outl(tmp, (unsigned long) (base + offset));
|
||||
+ sunxi_io_write(base, offset, tmp);
|
||||
}
|
||||
|
||||
|
||||
--
|
||||
2.14.1
|
||||
|
||||
@@ -1,9 +1,69 @@
|
||||
config BR2_PACKAGE_SUNXI_TOOLS
|
||||
bool "sunxi nand-part"
|
||||
bool "sunxi-tools"
|
||||
depends on BR2_arm
|
||||
help
|
||||
nand-part is part of sunxi-tools for Allwinner A10 (aka
|
||||
sun4i) and A13 (aka sun5i) based devices. It is a tool to
|
||||
repartition the internal NAND on sunxi devices.
|
||||
Tools for Allwinner A10 (aka sun4i) and A13 (aka sun5i)
|
||||
based devices.
|
||||
|
||||
http://linux-sunxi.org/Sunxi-tools
|
||||
|
||||
if BR2_PACKAGE_SUNXI_TOOLS
|
||||
|
||||
config BR2_PACKAGE_SUNXI_TOOLS_FEXC
|
||||
bool "sunxi-fexc (fex2bin & bin2fex)"
|
||||
help
|
||||
Convert between .fex board definition files and binary
|
||||
format. These tools are specific for the linux-sunxi kernel
|
||||
and do not apply to the mainline Linux kernel version.
|
||||
|
||||
config BR2_PACKAGE_SUNXI_TOOLS_BOOTINFO
|
||||
bool "sunxi-bootinfo"
|
||||
help
|
||||
Displays information about sunxi boot code.
|
||||
|
||||
config BR2_PACKAGE_SUNXI_TOOLS_FEL
|
||||
bool "sunxi-fel"
|
||||
depends on BR2_TOOLCHAIN_HAS_THREADS # libusb
|
||||
select BR2_PACKAGE_LIBUSB
|
||||
help
|
||||
The sunxi-fel command can interact with a sunxi device in
|
||||
fel mode. This allows do download code to memory and execute
|
||||
it.
|
||||
|
||||
comment "sunxi-fel needs a toolchain w/ threads"
|
||||
depends on !BR2_TOOLCHAIN_HAS_THREADS
|
||||
|
||||
config BR2_PACKAGE_SUNXI_TOOLS_NAND_PART
|
||||
bool "sunxi-nand-part"
|
||||
default y
|
||||
help
|
||||
The sunxi-nand-part command allows to repartition the internal
|
||||
NAND on sunxi devices.
|
||||
|
||||
config BR2_PACKAGE_SUNXI_TOOLS_PIO
|
||||
bool "sunxi-pio"
|
||||
help
|
||||
GPIO manipulation tool for sunxi boards.
|
||||
|
||||
config BR2_PACKAGE_SUNXI_TOOLS_MEMINFO
|
||||
bool "sunxi-meminfo"
|
||||
help
|
||||
Utility to retrieve DRAM information from registers on
|
||||
Allwinner SoCs. Specific for the linux-sunxi kernel - does
|
||||
not apply to the mainline Linux kernel version.
|
||||
|
||||
config BR2_PACKAGE_SUNXI_TOOLS_PHOENIX_INFO
|
||||
bool "phoenix_info"
|
||||
help
|
||||
Display information about self-installing SD card images
|
||||
(created with Phoenix Card).
|
||||
|
||||
https://linux-sunxi.org/PhoenixCard
|
||||
|
||||
config BR2_PACKAGE_SUNXI_TOOLS_NAND_IMAGE_BUILDER
|
||||
bool "sunxi-nand-image-builder"
|
||||
help
|
||||
Creates a raw NAND image that can be read by the sunxi NAND
|
||||
controller.
|
||||
|
||||
endif # BR2_PACKAGE_SUNXI_TOOLS
|
||||
|
||||
@@ -11,25 +11,52 @@ SUNXI_TOOLS_LICENSE_FILES = LICENSE.md
|
||||
HOST_SUNXI_TOOLS_DEPENDENCIES = host-libusb host-pkgconf
|
||||
FEX2BIN = $(HOST_DIR)/bin/fex2bin
|
||||
|
||||
SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_FEXC) += sunxi-fexc
|
||||
SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_BOOTINFO) += sunxi-bootinfo
|
||||
SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_FEL) += sunxi-fel
|
||||
SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_NAND_PART) += sunxi-nand-part
|
||||
SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_PIO) += sunxi-pio
|
||||
SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_MEMINFO) += sunxi-meminfo
|
||||
SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_PHOENIX_INFO) += phoenix_info
|
||||
SUNXI_TOOLS_TARGETS_$(BR2_PACKAGE_SUNXI_TOOLS_NAND_IMAGE_BUILDER) += \
|
||||
sunxi-nand-image-builder
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SUNXI_TOOLS_FEXC),y)
|
||||
SUNXI_TOOLS_FEXC_LINKS += fex2bin bin2fex
|
||||
endif
|
||||
|
||||
ifeq ($(BR2_PACKAGE_SUNXI_TOOLS_FEL),y)
|
||||
SUNXI_TOOLS_DEPENDENCIES += libusb host-pkgconf
|
||||
endif
|
||||
|
||||
define HOST_SUNXI_TOOLS_BUILD_CMDS
|
||||
$(HOST_MAKE_ENV) $(MAKE) CC="$(HOSTCC)" PREFIX=$(HOST_DIR) \
|
||||
EXTRA_CFLAGS="$(HOST_CFLAGS)" LDFLAGS="$(HOST_LDFLAGS)" \
|
||||
-C $(@D) tools
|
||||
$(HOST_MAKE_ENV) $(MAKE) CROSS_COMPILE="" CC="$(HOSTCC)" \
|
||||
PREFIX=$(HOST_DIR) EXTRA_CFLAGS="$(HOST_CFLAGS)" \
|
||||
LDFLAGS="$(HOST_LDFLAGS)" -C $(@D) tools misc
|
||||
endef
|
||||
|
||||
define HOST_SUNXI_TOOLS_INSTALL_CMDS
|
||||
$(HOST_MAKE_ENV) $(MAKE) PREFIX=$(HOST_DIR) \
|
||||
-C $(@D) install-tools
|
||||
$(HOST_MAKE_ENV) $(MAKE) CROSS_COMPILE="" CC="$(HOSTCC)" \
|
||||
PREFIX=$(HOST_DIR) EXTRA_CFLAGS="$(HOST_CFLAGS)" \
|
||||
LDFLAGS="$(HOST_LDFLAGS)" -C $(@D) install-tools install-misc
|
||||
endef
|
||||
|
||||
define SUNXI_TOOLS_BUILD_CMDS
|
||||
$(TARGET_MAKE_ENV) $(MAKE) CC="$(TARGET_CC)" PREFIX=/usr \
|
||||
EXTRA_CFLAGS="$(TARGET_CFLAGS)" LDFLAGS="$(TARGET_LDFLAGS)" \
|
||||
-C $(@D) sunxi-nand-part
|
||||
$(foreach t,$(SUNXI_TOOLS_TARGETS_y), \
|
||||
$(TARGET_MAKE_ENV) $(MAKE) CROSS_COMPILE="$(TARGET_CROSS)" \
|
||||
CC="$(TARGET_CC)" PREFIX=/usr \
|
||||
EXTRA_CFLAGS="$(TARGET_CFLAGS)" \
|
||||
LDFLAGS="$(TARGET_LDFLAGS)" -C $(@D) $(t)
|
||||
)
|
||||
endef
|
||||
|
||||
define SUNXI_TOOLS_INSTALL_TARGET_CMDS
|
||||
$(INSTALL) -D -m 0755 $(@D)/sunxi-nand-part $(TARGET_DIR)/usr/bin/sunxi-nand-part
|
||||
$(foreach t,$(SUNXI_TOOLS_TARGETS_y), \
|
||||
$(INSTALL) -D -m 0755 $(@D)/$(t) $(TARGET_DIR)/usr/bin/$(t)
|
||||
)
|
||||
$(foreach t,$(SUNXI_TOOLS_FEXC_LINKS), \
|
||||
ln -nfs sunxi-fexc $(TARGET_DIR)/usr/bin/$(t)
|
||||
)
|
||||
endef
|
||||
|
||||
$(eval $(generic-package))
|
||||
|
||||
Reference in New Issue
Block a user