Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Feature/lcb support dev #358

Merged
merged 11 commits into from
Sep 29, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitignore
Original file line number Diff line number Diff line change
@@ -1,9 +1,6 @@
# Ignore build directory
build*/

# Created by coffee-maker.sh
/*.coffee

# Ignore shared directories
shared-*/

Expand Down
4 changes: 4 additions & 0 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,10 @@ distribution is [supported](https://docs.yoctoproject.org/singleindex.html#suppo

Additional host tools need to be installed for native builds to work.

* Install the "npm" package, doing it like this circumvents issues with broken dependencies:
sudo apt-get install nodejs-dev node-gyp libssl1.0-dev
sudo apt-get install npm

* Run the barys build script:
`./balena-yocto-scripts/build/barys`

Expand Down
1 change: 1 addition & 0 deletions layers/meta-balena-topic/README.md
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -5,3 +5,4 @@ This repository enables building BalenaOS for chosen meta-topic machines.

## Supported machines
* tdpzu9
* lcbzu9
1 change: 1 addition & 0 deletions layers/meta-balena-topic/conf/samples/bblayers.conf.sample
100644 → 100755
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,5 @@ BBLAYERS ?= " \
${TOPDIR}/../layers/meta-xilinx/meta-xilinx-bsp \
${TOPDIR}/../layers/meta-xilinx/meta-xilinx-core \
${TOPDIR}/../layers/meta-topic \
${TOPDIR}/../layers/meta-lowpad-lcb \
"
1 change: 1 addition & 0 deletions layers/meta-balena-topic/conf/samples/local.conf.sample
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
# Supported machines
MACHINE ?= "tdpzu9"
MACHINE ?= "lcbzu9"

LICENSE_FLAGS_WHITELIST += "xilinx"

Expand Down
10 changes: 10 additions & 0 deletions layers/meta-balena-topic/recipes-core/images/balena-image.bbappend
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
DEPENDS += "balena-bootscript"

BALENA_BOOT_BIN ?= ""
DEPENDS += "${BALENA_BOOT_BIN}"

# Add components that we need to boot
IMAGE_INSTALL += "\
bootscript \
Expand All @@ -10,6 +13,7 @@ IMAGE_INSTALL += "\

BALENA_EXTRA_BOOT_FILES:zynqmp = "boot.bin:/boot.bin u-boot.itb:/u-boot.itb balena-bootscript.scr:/boot.scr"
BALENA_EXTRA_BOOT_FILES:zynq = "boot.bin:/boot.bin u-boot.img:/u-boot.img balena-bootscript.scr:/boot.scr"
BALENA_EXTRA_BOOT_FILES:lcbzu9 = "lcb-boot.bin:/boot.bin u-boot.itb:/u-boot.itb balena-bootscript.scr:/boot.scr"
BALENA_BOOT_PARTITION_FILES:append = " ${BALENA_EXTRA_BOOT_FILES}"

DEVICETREELINKS ??= "system.dtb ${DEVICETREE}"
Expand All @@ -33,3 +37,9 @@ ROOTFS_POSTPROCESS_COMMAND += "topicbalena_rootfs_postprocess; "
# We need to increase the rootfs size to make space for additional drivers in ROOTFS.
# BalenaOS image has a 700MB max size defined in 'image_types_balena.bbclass'
IMAGE_ROOTFS_SIZE="409600"

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What is this needed for? Isn't /etc/os-release enough to provide with the info you need?

Copy link
Collaborator Author

@FrancoisLoubser-1 FrancoisLoubser-1 Sep 12, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

os-release has a 'nice' version of BalenaOS, but a commit hash is the absolute truth.
I suppose this only helps while developing on a branch, where the os-release stays fixed. On the 'master'/'production' BalenaOS os-release does get stepped quite regularly.
Doesn't hurt to have it here, but I can easily remove it as well.

# We require access to the git repository here, so we must run outside fakeroot
do_addrevisioninfo() {
git rev-parse --verify --short HEAD >> ${IMAGE_ROOTFS}${sysconfdir}/revision
}
addtask do_addrevisioninfo before do_image after do_rootfs
Empty file.
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 8d7a238307d8a1afc93738d676cd90aef06b2cea Mon Sep 17 00:00:00 2001
From 5c3a5e306bca1e4bd28920cb4c7db63600287bcd Mon Sep 17 00:00:00 2001
From: Francois <[email protected]>
Date: Tue, 10 May 2022 17:23:04 +0200
Subject: [PATCH 1/3] Makefile: Sanitize config for non-x86 platforms
Expand All @@ -8,10 +8,10 @@ Subject: [PATCH 1/3] Makefile: Sanitize config for non-x86 platforms
1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Makefile b/Makefile
index 22bd0e0..e5bc585 100755
index b06bbbe..9a46be2 100755
--- a/Makefile
+++ b/Makefile
@@ -118,7 +118,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y
@@ -120,7 +120,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y
###################### MP HW TX MODE FOR VHT #######################
CONFIG_MP_VHT_HW_TX_MODE = n
###################### Platform Related #######################
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
From 90b467e0c40343553de7cf31e075caa25ab2538b Mon Sep 17 00:00:00 2001
From 0b43fbe6d038362c499c3238ac3920457fc3717c Mon Sep 17 00:00:00 2001
From: Francois <[email protected]>
Date: Wed, 11 May 2022 10:38:55 +0200
Subject: [PATCH 2/3] Add CONFIG_PLATFORM_OPENEMBEDDED to Makefile as default
Expand All @@ -9,18 +9,18 @@ Subject: [PATCH 2/3] Add CONFIG_PLATFORM_OPENEMBEDDED to Makefile as default
1 file changed, 20 insertions(+)

diff --git a/Makefile b/Makefile
index e5bc585..2b1742c 100755
index 9a46be2..ddc9a99 100755
--- a/Makefile
+++ b/Makefile
@@ -118,6 +118,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y
@@ -120,6 +120,7 @@ CONFIG_RTW_SDIO_PM_KEEP_POWER = y
###################### MP HW TX MODE FOR VHT #######################
CONFIG_MP_VHT_HW_TX_MODE = n
###################### Platform Related #######################
+CONFIG_PLATFORM_OPENEMBEDDED = y
CONFIG_PLATFORM_I386_PC = n
CONFIG_PLATFORM_ANDROID_X86 = n
CONFIG_PLATFORM_ANDROID_INTEL_X86 = n
@@ -1324,6 +1325,18 @@ endif
@@ -1326,6 +1327,18 @@ endif
INSTALL_PREFIX :=
endif

Expand All @@ -39,7 +39,7 @@ index e5bc585..2b1742c 100755
ifeq ($(CONFIG_PLATFORM_NV_TK1), y)
EXTRA_CFLAGS += -DCONFIG_PLATFORM_NV_TK1
EXTRA_CFLAGS += -DCONFIG_LITTLE_ENDIAN
@@ -2386,8 +2399,15 @@ export CONFIG_RTL8822BU = m
@@ -2388,8 +2401,15 @@ export CONFIG_RTL8822BU = m

all: modules

Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
From d5444ed2b58624a478f7d048bfe38080dfa0dc2d Mon Sep 17 00:00:00 2001
From c01b09470970963f07dd4efb35653067c0178892 Mon Sep 17 00:00:00 2001
From: Francois <[email protected]>
Date: Wed, 11 May 2022 11:33:20 +0200
Subject: [PATCH 3/3] Don't use __DATE__ Solves this error: error: macro

__DATE__ might prevent reproducible builds [-Werror=date-time]

Remove the 'bc' kludge that checks the GCC version as well
Expand All @@ -12,12 +13,12 @@ Remove the 'bc' kludge that checks the GCC version as well
mode change 100644 => 100755 core/rtw_debug.c

diff --git a/Makefile b/Makefile
index 2b1742c..01dd7d9 100755
index ddc9a99..ef0476d 100755
--- a/Makefile
+++ b/Makefile
@@ -11,11 +11,6 @@ EXTRA_CFLAGS += -Wno-unused-function
EXTRA_CFLAGS += -Wno-unused-parameter
EXTRA_CFLAGS += -Wno-unused-variable
@@ -13,11 +13,6 @@ EXTRA_CFLAGS += -Wno-unused-variable
EXTRA_CFLAGS += -Wno-array-bounds
EXTRA_CFLAGS += -Wno-address

-GCC_VER_49 := $(shell echo `$(CC) -dumpversion | cut -f1-2 -d.` \>= 4.9 | bc )
-ifeq ($(GCC_VER_49),1)
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
SRC_URI = "git://github.com/intel/${BPN};branch=main;protocol=https"
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Do you use bmap-tools? What is the purpose?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Not explicitly. We just use the balenaos-img output.
The build does, however, generate some ..rootfs.bmap outputs by default in image_types_balena.bbclass, which could be used with the bmaptool for flashing.

This commit was more for cleaning up the build log to remove warnings.

204 changes: 204 additions & 0 deletions layers/meta-lowpad-lcb/COPYING.Apache-2.0
Original file line number Diff line number Diff line change
@@ -0,0 +1,204 @@


Apache License
Version 2.0, January 2004
http://www.apache.org/licenses/

TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION

1. Definitions.

"License" shall mean the terms and conditions for use, reproduction,
and distribution as defined by Sections 1 through 9 of this document.

"Licensor" shall mean the copyright owner or entity authorized by
the copyright owner that is granting the License.

"Legal Entity" shall mean the union of the acting entity and all
other entities that control, are controlled by, or are under common
control with that entity. For the purposes of this definition,
"control" means (i) the power, direct or indirect, to cause the
direction or management of such entity, whether by contract or
otherwise, or (ii) ownership of fifty percent (50%) or more of the
outstanding shares, or (iii) beneficial ownership of such entity.

"You" (or "Your") shall mean an individual or Legal Entity
exercising permissions granted by this License.

"Source" form shall mean the preferred form for making modifications,
including but not limited to software source code, documentation
source, and configuration files.

"Object" form shall mean any form resulting from mechanical
transformation or translation of a Source form, including but
not limited to compiled object code, generated documentation,
and conversions to other media types.

"Work" shall mean the work of authorship, whether in Source or
Object form, made available under the License, as indicated by a
copyright notice that is included in or attached to the work
(an example is provided in the Appendix below).

"Derivative Works" shall mean any work, whether in Source or Object
form, that is based on (or derived from) the Work and for which the
editorial revisions, annotations, elaborations, or other modifications
represent, as a whole, an original work of authorship. For the purposes
of this License, Derivative Works shall not include works that remain
separable from, or merely link (or bind by name) to the interfaces of,
the Work and Derivative Works thereof.

"Contribution" shall mean any work of authorship, including
the original version of the Work and any modifications or additions
to that Work or Derivative Works thereof, that is intentionally
submitted to Licensor for inclusion in the Work by the copyright owner
or by an individual or Legal Entity authorized to submit on behalf of
the copyright owner. For the purposes of this definition, "submitted"
means any form of electronic, verbal, or written communication sent
to the Licensor or its representatives, including but not limited to
communication on electronic mailing lists, source code control systems,
and issue tracking systems that are managed by, or on behalf of, the
Licensor for the purpose of discussing and improving the Work, but
excluding communication that is conspicuously marked or otherwise
designated in writing by the copyright owner as "Not a Contribution."

"Contributor" shall mean Licensor and any individual or Legal Entity
on behalf of whom a Contribution has been received by Licensor and
subsequently incorporated within the Work.

2. Grant of Copyright License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
copyright license to reproduce, prepare Derivative Works of,
publicly display, publicly perform, sublicense, and distribute the
Work and such Derivative Works in Source or Object form.

3. Grant of Patent License. Subject to the terms and conditions of
this License, each Contributor hereby grants to You a perpetual,
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
(except as stated in this section) patent license to make, have made,
use, offer to sell, sell, import, and otherwise transfer the Work,
where such license applies only to those patent claims licensable
by such Contributor that are necessarily infringed by their
Contribution(s) alone or by combination of their Contribution(s)
with the Work to which such Contribution(s) was submitted. If You
institute patent litigation against any entity (including a
cross-claim or counterclaim in a lawsuit) alleging that the Work
or a Contribution incorporated within the Work constitutes direct
or contributory patent infringement, then any patent licenses
granted to You under this License for that Work shall terminate
as of the date such litigation is filed.

4. Redistribution. You may reproduce and distribute copies of the
Work or Derivative Works thereof in any medium, with or without
modifications, and in Source or Object form, provided that You
meet the following conditions:

(a) You must give any other recipients of the Work or
Derivative Works a copy of this License; and

(b) You must cause any modified files to carry prominent notices
stating that You changed the files; and

(c) You must retain, in the Source form of any Derivative Works
that You distribute, all copyright, patent, trademark, and
attribution notices from the Source form of the Work,
excluding those notices that do not pertain to any part of
the Derivative Works; and

(d) If the Work includes a "NOTICE" text file as part of its
distribution, then any Derivative Works that You distribute must
include a readable copy of the attribution notices contained
within such NOTICE file, excluding those notices that do not
pertain to any part of the Derivative Works, in at least one
of the following places: within a NOTICE text file distributed
as part of the Derivative Works; within the Source form or
documentation, if provided along with the Derivative Works; or,
within a display generated by the Derivative Works, if and
wherever such third-party notices normally appear. The contents
of the NOTICE file are for informational purposes only and
do not modify the License. You may add Your own attribution
notices within Derivative Works that You distribute, alongside
or as an addendum to the NOTICE text from the Work, provided
that such additional attribution notices cannot be construed
as modifying the License.

You may add Your own copyright statement to Your modifications and
may provide additional or different license terms and conditions
for use, reproduction, or distribution of Your modifications, or
for any such Derivative Works as a whole, provided Your use,
reproduction, and distribution of the Work otherwise complies with
the conditions stated in this License.

5. Submission of Contributions. Unless You explicitly state otherwise,
any Contribution intentionally submitted for inclusion in the Work
by You to the Licensor shall be under the terms and conditions of
this License, without any additional terms or conditions.
Notwithstanding the above, nothing herein shall supersede or modify
the terms of any separate license agreement you may have executed
with Licensor regarding such Contributions.

6. Trademarks. This License does not grant permission to use the trade
names, trademarks, service marks, or product names of the Licensor,
except as required for reasonable and customary use in describing the
origin of the Work and reproducing the content of the NOTICE file.

7. Disclaimer of Warranty. Unless required by applicable law or
agreed to in writing, Licensor provides the Work (and each
Contributor provides its Contributions) on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
implied, including, without limitation, any warranties or conditions
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
PARTICULAR PURPOSE. You are solely responsible for determining the
appropriateness of using or redistributing the Work and assume any
risks associated with Your exercise of permissions under this License.

8. Limitation of Liability. In no event and under no legal theory,
whether in tort (including negligence), contract, or otherwise,
unless required by applicable law (such as deliberate and grossly
negligent acts) or agreed to in writing, shall any Contributor be
liable to You for damages, including any direct, indirect, special,
incidental, or consequential damages of any character arising as a
result of this License or out of the use or inability to use the
Work (including but not limited to damages for loss of goodwill,
work stoppage, computer failure or malfunction, or any and all
other commercial damages or losses), even if such Contributor
has been advised of the possibility of such damages.

9. Accepting Warranty or Additional Liability. While redistributing
the Work or Derivative Works thereof, You may choose to offer,
and charge a fee for, acceptance of support, warranty, indemnity,
or other liability obligations and/or rights consistent with this
License. However, in accepting such obligations, You may act only
on Your own behalf and on Your sole responsibility, not on behalf
of any other Contributor, and only if You agree to indemnify,
defend, and hold each Contributor harmless for any liability
incurred by, or claims asserted against, such Contributor by reason
of your accepting any such warranty or additional liability.

END OF TERMS AND CONDITIONS

APPENDIX: How to apply the Apache License to your work.

To apply the Apache License to your work, attach the following
boilerplate notice, with the fields enclosed by brackets "[]"
replaced with your own identifying information. (Don`t include
the brackets!) The text should be enclosed in the appropriate
comment syntax for the file format. We also recommend that a
file or class name and description of purpose be included on the
same "printed page" as the copyright notice for easier
identification within third-party archives.

Copyright [yyyy] [name of copyright owner]

Licensed under the Apache License, Version 2.0 (the "License");
you may not use this file except in compliance with the License.
You may obtain a copy of the License at

http://www.apache.org/licenses/LICENSE-2.0

Unless required by applicable law or agreed to in writing, software
distributed under the License is distributed on an "AS IS" BASIS,
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
See the License for the specific language governing permissions and
limitations under the License.

7 changes: 7 additions & 0 deletions layers/meta-lowpad-lcb/README.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,7 @@
# Resin.io layer for meta-topic supported boards

## Description
This repository enables building BalenaOS for chosen meta-topic machines.

## Supported machines
* lcbzu9
18 changes: 18 additions & 0 deletions layers/meta-lowpad-lcb/conf/layer.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,18 @@
# OE layer configuration

# We have a conf directory, append to BBPATH
BBPATH .= ":${LAYERDIR}"

# We have recipes-* directories, add to BBFILES
BBFILES += "${LAYERDIR}/recipes-*/*/*.bb ${LAYERDIR}/recipes-*/*/*.bbappend"

BBFILE_COLLECTIONS += "lowpad-lcb-layer"
BBFILE_PATTERN_lowpad-lcb-layer := "^${LAYERDIR}/"

LAYERDEPENDS_lowpad-lcb-layer = "topic-layer"

LAYERSERIES_COMPAT_lowpad-lcb-layer = "honister"

# Give this layer precendence
BBFILE_PRIORITY_lowpad-lcb-layer = "20"

Loading