Skip to content

Commit

Permalink
Merge branch 'main' into arm64-more-boards
Browse files Browse the repository at this point in the history
  • Loading branch information
lleyton committed Jan 8, 2024
2 parents 0d7f91d + 46f6cb0 commit e208239
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 6 deletions.
2 changes: 1 addition & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -74,7 +74,7 @@ $(KPART_A64): $(BZIMAGE_A64)

$(BZIMAGE_A64): $(INITFSZ_A64)
cp $(CONFDIR)/$(CONFIG_A64) kernel/.config
[ uname -m = x86_64 ] && ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- make -C kernel || make -C kernel
[ $(shell uname -m) = x86_64 ] && ARCH=arm64 CROSS_COMPILE=aarch64-linux-gnu- make -C kernel || make -C kernel
cp kernel/arch/arm64/boot/Image.gz $(WORKDIR)/$(BZIMAGE_A64)

$(INITFSZ_A64): $(INITFS_A64)
Expand Down
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ An experimental bootloader for ChomeOS's depthcharge.
## 📕 Explainer
Submarine provides a minimal Linux environmemt that lives in a small partition (16mb) on the disk. We use this environment to bootstrap a full Linux system (or a different system if you're brave.)

Additional documention can be found on Fyra Developer (under construction!)

[Additional documention can be found on Fyra Developer (under construction!)
](https://developer.fyralabs.com/submarine)

## 📦 Builds

Expand Down
12 changes: 9 additions & 3 deletions configs/kernel.x86
Original file line number Diff line number Diff line change
Expand Up @@ -296,7 +296,7 @@ CONFIG_CC_HAS_SANE_STACKPROTECTOR=y
# CONFIG_GOLDFISH is not set
# CONFIG_X86_CPU_RESCTRL is not set
# CONFIG_X86_EXTENDED_PLATFORM is not set
# CONFIG_X86_INTEL_LPSS is not set
CONFIG_X86_INTEL_LPSS=y
CONFIG_X86_AMD_PLATFORM_DEVICE=y
CONFIG_IOSF_MBI=y
# CONFIG_SCHED_OMIT_FRAME_POINTER is not set
Expand Down Expand Up @@ -467,7 +467,9 @@ CONFIG_HAVE_ACPI_APEI_NMI=y
# CONFIG_ACPI_CONFIGFS is not set
# CONFIG_ACPI_PFRUT is not set
# CONFIG_ACPI_FFH is not set
# CONFIG_PMIC_OPREGION is not set
CONFIG_PMIC_OPREGION=y
CONFIG_BYTCRC_PMIC_OPREGION=y
CONFIG_CHTCRC_PMIC_OPREGION=y
CONFIG_X86_PM_TIMER=y

#
Expand Down Expand Up @@ -888,6 +890,8 @@ CONFIG_ALLOW_DEV_COREDUMP=y
CONFIG_GENERIC_CPU_AUTOPROBE=y
CONFIG_GENERIC_CPU_VULNERABILITIES=y
CONFIG_REGMAP=y
CONFIG_REGMAP_I2C=y
CONFIG_REGMAP_IRQ=y
CONFIG_DMA_SHARED_BUFFER=y
# CONFIG_DMA_FENCE_TRACE is not set
# CONFIG_FW_DEVLINK_SYNC_STATE_TIMEOUT is not set
Expand Down Expand Up @@ -1570,6 +1574,7 @@ CONFIG_GPIO_ICH=y
#
# MFD GPIO expanders
#
# CONFIG_GPIO_CRYSTAL_COVE is not set
# CONFIG_GPIO_ELKHARTLAKE is not set
# end of MFD GPIO expanders

Expand Down Expand Up @@ -1700,7 +1705,7 @@ CONFIG_MFD_CROS_EC_DEV=y
# CONFIG_MFD_INTEL_QUARK_I2C_GPIO is not set
CONFIG_LPC_ICH=y
CONFIG_LPC_SCH=y
# CONFIG_INTEL_SOC_PMIC is not set
CONFIG_INTEL_SOC_PMIC=y
# CONFIG_INTEL_SOC_PMIC_CHTWC is not set
# CONFIG_INTEL_SOC_PMIC_CHTDC_TI is not set
CONFIG_MFD_INTEL_LPSS=y
Expand Down Expand Up @@ -2442,6 +2447,7 @@ CONFIG_WMI_BMOF=y

# CONFIG_INTEL_HID_EVENT is not set
# CONFIG_INTEL_VBTN is not set
CONFIG_INTEL_BYTCRC_PWRSRC=y
# CONFIG_INTEL_PUNIT_IPC is not set
# CONFIG_INTEL_RST is not set
# CONFIG_INTEL_SMARTCONNECT is not set
Expand Down

0 comments on commit e208239

Please sign in to comment.