Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
T
targets
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Container registry
Model registry
Operate
Environments
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Issue analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
Feed
targets
Commits
6d889d70
Commit
6d889d70
authored
9 months ago
by
Piotr Kubik
Browse files
Options
Downloads
Patches
Plain Diff
[wip]airoha: Use FITBLK structure for boot and rootfs
tbd
parent
280d18eb
Branches
Branches containing commit
Tags
v2016.09-rc2
Tags containing commit
No related merge requests found
Changes
3
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
airoha/base-files/lib/upgrade/platform.sh
+1
-1
1 addition, 1 deletion
airoha/base-files/lib/upgrade/platform.sh
airoha/image/Makefile
+3
-2
3 additions, 2 deletions
airoha/image/Makefile
airoha/image/iopsys-image-common.mk
+1
-3
1 addition, 3 deletions
airoha/image/iopsys-image-common.mk
with
5 additions
and
6 deletions
airoha/base-files/lib/upgrade/platform.sh
+
1
−
1
View file @
6d889d70
...
@@ -49,7 +49,7 @@ platform_list_image_components() {
...
@@ -49,7 +49,7 @@ platform_list_image_components() {
# <type> /configuration/<name> <required> <target device>
# <type> /configuration/<name> <required> <target device>
echo
"pre_upgrade upgrade_bundle optional"
echo
"pre_upgrade upgrade_bundle optional"
echo
"image boot required boot
\$
{next_bank_id}"
echo
"image boot required boot
\$
{next_bank_id}"
echo
"image rootfs
required
rootfs
\$
{next_bank_id}"
echo
"image rootfs
optional
rootfs
\$
{next_bank_id}"
if
bootloader_upgrade_enabled 2>/dev/null
"
$image
"
"bootloader"
"
$boot_dev
"
;
then
if
bootloader_upgrade_enabled 2>/dev/null
"
$image
"
"bootloader"
"
$boot_dev
"
;
then
echo
"bootloader bootloader optional
$boot_dev
"
echo
"bootloader bootloader optional
$boot_dev
"
fi
fi
...
...
This diff is collapsed.
Click to expand it.
airoha/image/Makefile
+
3
−
2
View file @
6d889d70
...
@@ -27,9 +27,10 @@ define Device/Default-airoha-common
...
@@ -27,9 +27,10 @@ define Device/Default-airoha-common
$(Device/Default-airoha-nand)
$(Device/Default-airoha-nand)
PROFILES
=
Default
PROFILES
=
Default
DEVICE_VENDOR
:=
IOPSYS
DEVICE_VENDOR
:=
IOPSYS
IMAGE/sysupgrade.itb
:
= iopsys-fit-upgrade-image | iopsys-sign-image | create-last-link -squashfs-sysupgrade.itb last.itb
IMAGE/sysupgrade.itb
:
= append-kernel | iowrt-kernel-fit lzma external-static-with-rootfs-with-u-boot-ram |
\
iopsys-fit-upgrade-image | iopsys-sign-image | create-last-link -squashfs-sysupgrade.itb last.itb
IMAGES
:=
sysupgrade.itb .img
IMAGES
:=
sysupgrade.itb .img
KERNEL
:=
kernel-bin | lzma | generate-uboot-images
| iowrt-kernel-fit lzma external-static-with-u-boot-ram
KERNEL
:=
kernel-bin | lzma | generate-uboot-images
KERNEL_INITRAMFS
:=
kernel-bin | lzma | iowrt-kernel-fit lzma external-static-with-initrd
KERNEL_INITRAMFS
:=
kernel-bin | lzma | iowrt-kernel-fit lzma external-static-with-initrd
KERNEL_NAME
:=
vmlinux
KERNEL_NAME
:=
vmlinux
DEVICE_UBI_LAYOUT
:=
ubinize.cfg.in
DEVICE_UBI_LAYOUT
:=
ubinize.cfg.in
...
...
This diff is collapsed.
Click to expand it.
airoha/image/iopsys-image-common.mk
+
1
−
3
View file @
6d889d70
...
@@ -8,15 +8,13 @@ define Build/iopsys-fit-upgrade-image
...
@@ -8,15 +8,13 @@ define Build/iopsys-fit-upgrade-image
@echo
GenerateUpgradeFIT
@echo
GenerateUpgradeFIT
$(
call
iopsys-fit-upgrade-image-prepare,
$@
,
\
$(
call
iopsys-fit-upgrade-image-prepare,
$@
,
\
bootloader
$(
STAGING_DIR_IMAGE
)
/
$(
UBOOT_TARGET
)
-
$(
DEVICE_NAME
)
-u-boot-nand
.bin
\
bootloader
$(
STAGING_DIR_IMAGE
)
/
$(
UBOOT_TARGET
)
-
$(
DEVICE_NAME
)
-u-boot-nand
.bin
\
boot
$(
IMAGE_KERNEL
)
\
boot
$@
\
rootfs
$(
IMAGE_ROOTFS
)
\
u-boot-env
$(
STAGING_DIR_IMAGE
)
/
$(
UBOOT_TARGET
)
-env_dump_filtered
.bin
)
u-boot-env
$(
STAGING_DIR_IMAGE
)
/
$(
UBOOT_TARGET
)
-env_dump_filtered
.bin
)
$(
call
iopsys-fit-upgrade-image-add-configs-same,
$@
.its,
\
$(
call
iopsys-fit-upgrade-image-add-configs-same,
$@
.its,
\
compat_versions:
"1 0"
,
\
compat_versions:
"1 0"
,
\
first,
\
first,
\
bootloader
\
bootloader
\
boot
\
boot
\
rootfs
\
u-boot-env
\
u-boot-env
\
$(
if
$(
CONFIG_TARGET_UPGRADE_BUNDLE
)
,upgrade_bundle
)
\
$(
if
$(
CONFIG_TARGET_UPGRADE_BUNDLE
)
,upgrade_bundle
)
\
)
)
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment