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.

Sign up for GitHub

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

Jump to bottom

Move board-specific config (Odroid C1) away from family config #6801

Merged
merged 1 commit into from
Jun 27, 2024
Merged

Move board-specific config (Odroid C1) away from family config #6801

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
15 changes: 15 additions & 0 deletions config/boards/odroidc1.csc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,23 @@ BOARDFAMILY="meson8b"
BOARD_MAINTAINER=""
KERNEL_TARGET="current,edge"

BOOTDIR='u-boot-odroidc1'
BOOTSOURCE='https://github.com/hardkernel/u-boot.git'
BOOTBRANCH='branch:odroidc-v2011.03'
BOOTPATCHDIR="legacy"
UBOOT_COMPILER="arm-linux-gnueabi-"
UBOOT_USE_GCC='< 4.9'
BOOTCONFIG="odroidc_config"
BOOTSCRIPT="boot-odroid-c1.ini:boot.ini"

UBOOT_TARGET_MAP=';;sd_fuse/bl1.bin.hardkernel sd_fuse/u-boot.bin'

BOOTSIZE="200"
BOOTFS_TYPE="fat"

write_uboot_platform() {
dd if=$1/bl1.bin.hardkernel of=$2 bs=1 count=442 conv=fsync > /dev/null 2>&1
dd if=$1/bl1.bin.hardkernel of=$2 bs=512 skip=1 seek=1 conv=fsync > /dev/null 2>&1
dd if=$1/u-boot.bin of=$2 bs=512 seek=64 conv=fsync > /dev/null 2>&1
dd if=/dev/zero of=$2 seek=1024 count=32 bs=512 conv=fsync > /dev/null 2>&1
}
4 changes: 4 additions & 0 deletions config/boards/onecloud.conf
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,3 +16,7 @@ BOOTFS_TYPE="fat"
# FIXED_IMAGE_SIZE=7456

BOOT_LOGO=desktop

family_tweaks() {
cp $SRC/packages/blobs/splash/armbian-u-boot-24.bmp $SDCARD/boot/boot.bmp
}
29 changes: 1 addition & 28 deletions config/sources/families/include/meson_common.inc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,26 +19,7 @@ CPUMIN=504000
CPUMAX=1632000
GOVERNOR=ondemand

case $BOARD in
odroidc1)

BOOTDIR='u-boot-odroidc1'
BOOTSOURCE='https://github.com/hardkernel/u-boot.git'
BOOTBRANCH='branch:odroidc-v2011.03'
BOOTPATCHDIR="legacy"
UBOOT_COMPILER="arm-linux-gnueabi-"

UBOOT_TARGET_MAP=';;sd_fuse/bl1.bin.hardkernel sd_fuse/u-boot.bin'

write_uboot_platform() {
dd if=$1/bl1.bin.hardkernel of=$2 bs=1 count=442 conv=fsync > /dev/null 2>&1
dd if=$1/bl1.bin.hardkernel of=$2 bs=512 skip=1 seek=1 conv=fsync > /dev/null 2>&1
dd if=$1/u-boot.bin of=$2 bs=512 seek=64 conv=fsync > /dev/null 2>&1
dd if=/dev/zero of=$2 seek=1024 count=32 bs=512 conv=fsync > /dev/null 2>&1
}

;;
esac
SKIP_BOOTSPLASH="yes"

case $BRANCH in

Expand All @@ -55,14 +36,6 @@ case $BRANCH in
;;
esac

family_tweaks() {
case $BOARD in
onecloud)
cp $SRC/packages/blobs/splash/armbian-u-boot-24.bmp $SDCARD/boot/boot.bmp
;;
esac
}

family_tweaks_bsp() {
mkdir -p "$destination/etc/X11/xorg.conf.d"
cat <<- EOF > "$destination/etc/X11/xorg.conf.d/02-driver.conf"
Expand Down