Skip to contentSkip to conversation

OLPC XO updates

PATCH New Lubomir Rintel 2 participants 21 messages Jun 17, 2020

lore
Share & tools
lore
#0 lore raw

v2 cover OLPC XO updates

Hi,

please consider applying this patch set. The ultimate goal is to enable jffs2 images for the XO-1. While I that, I noticed that while tidying up the kernel configuration, I messed up a bit and some config symbols ended up disabled.

Since this was first posted, a 5.7 kernel was release. I've tested that 5.7.1 works well on both XO-1.75 (arm) and XO-1 (x86), so I've added two patches that bump the kernel version too.

The first few patches fix the kernel configuration:

[PATCH v2 01/17] board/olpc: move MTD symbols up to the common config [PATCH v2 02/17] board/olpc: move SERIO_OLPC_APSP to XO-1.75 [PATCH v2 03/17] board/olpc: move BACKLIGHT_CLASS_DEVICE up to common [PATCH v2 04/17] board/olpc: move the SDHCI drivers to appropriate board [PATCH v2 05/17] board/olpc: move GPIO_SYSFS to common config [PATCH v2 06/17] board/olpc: move LIS3_SPI to XO-1.75
[PATCH v2 07/17] board/olpc: enable dependencies of options we use [PATCH v2 08/17] board/olpc/xo-1: enable JFFS2
[PATCH v2 09/17] board/olpc/xo-1: enable STAGING
[PATCH v2 10/17] board/olpc/xo-1: enable ACPI
[PATCH v2 11/17] board/olpc/xo-1: drop garbage from kernel config

Followed by the jffs2 related enhancements:

[PATCH v2 12/17] board/olpc: set JFFS2 root when booting from a MTD [PATCH v2 13/17] configs/olpc_xo1: enable JFFS2 image [PATCH v2 14/17] board/olpc: move the paragraph on firmware up in the [PATCH v2 15/17] board/olpc: document flashing the JFFS2 image

These two are new in v2:

[PATCH v2 16/17] configs/olpc_xo1: bump kernel version [PATCH v2 17/17] configs/olpc_xo175: bump kernel version

Tested on a XO-1 and XO-1.75.

Thank you
Lubo

#1 lore raw

PATCH v2 1/17 board/olpc: move MTD symbols up to the common config

XO-1 has an internal MTD device.

Also, CONFIG_MTD_SPI_NOR was set twice for XO-1.75. One copy is removed, one remains.

---
 board/olpc/linux.config         | 2 ++
 board/olpc/xo-1.75/linux.config | 3 ---
 board/olpc/xo-1/linux.config    | 2 ++
 3 files changed, 4 insertions(+), 3 deletions(-)
board/olpc/linux.config +2 -0
index 0ea622eeec..524b80494a 100644
@@ -19,6 +19,8 @@ CONFIG_SCSI=y
 CONFIG_BLK_DEV_SD=y
 CONFIG_BLK_DEV_SR=y
 CONFIG_CHR_DEV_SG=y
+CONFIG_MTD=y
+CONFIG_MTD_BLOCK=y
 CONFIG_NETDEVICES=y
 CONFIG_LIBERTAS=m
 CONFIG_INPUT_MOUSEDEV=y
board/olpc/xo-1.75/linux.config +0 -3
index c5e0fe17e1..0ca7d16e30 100644
@@ -31,9 +31,6 @@ CONFIG_LIBERTAS_THINFIRM=m
 CONFIG_MWIFIEX=m
 CONFIG_MWIFIEX_SDIO=m
 CONFIG_MTD_SPI_NOR=m
-CONFIG_MTD=y
-CONFIG_MTD_BLOCK=y
-CONFIG_MTD_SPI_NOR=m
 CONFIG_I2C_PXA=y
 CONFIG_SERIAL_OF_PLATFORM=y
 CONFIG_SPI=y
board/olpc/xo-1/linux.config +2 -0
index 72d18ae009..594ee9547e 100644
@@ -22,7 +22,9 @@ CONFIG_CMA=y
 CONFIG_MTD_CMDLINE_PARTS=y
 CONFIG_MTD_REDBOOT_PARTS=y
 CONFIG_MTD_REDBOOT_DIRECTORY_BLOCK=0
+CONFIG_MTD_ONENAND=y
 CONFIG_MTD_ONENAND_GENERIC=y
+CONFIG_MTD_RAW_NAND=y
 CONFIG_MTD_NAND_CAFE=y
 CONFIG_MTD_UBI=y
 CONFIG_CS5535_MFGPT=y
Signature · 1 line
2.26.2
#2 lore raw

PATCH v2 2/17 board/olpc: move SERIO_OLPC_APSP to XO-1.75

In reply to Lubomir Rintel

This is the keyboard connected via the SP "security processor" on a XO-1.75. XO-1 has a regular PC keyboard.

---
 board/olpc/linux.config         | 1 -
 board/olpc/xo-1.75/linux.config | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)
board/olpc/linux.config +0 -1
index 524b80494a..75670936e5 100644
@@ -29,7 +29,6 @@ CONFIG_INPUT_MOUSEDEV_SCREEN_X=1200
 CONFIG_INPUT_MOUSEDEV_SCREEN_Y=900
 CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_TABLET=y
-CONFIG_SERIO_OLPC_APSP=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
 CONFIG_BATTERY_OLPC=y
board/olpc/xo-1.75/linux.config +1 -0
index 0ca7d16e30..4a779a3b23 100644
@@ -12,6 +12,7 @@ CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_VFP=y
 CONFIG_NEON=y
+CONFIG_SERIO_OLPC_APSP=y
 CONFIG_REGULATOR_88PG86X=m
 CONFIG_VIDEO_MMP_CAMERA=y
 CONFIG_DRM_ARMADA=y
Signature · 1 line
2.26.2
#3 lore raw

PATCH v2 3/17 board/olpc: move BACKLIGHT_CLASS_DEVICE up to common config

In reply to Lubomir Rintel

Both machines need it.

---
 board/olpc/linux.config         | 1 +
 board/olpc/xo-1.75/linux.config | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
board/olpc/linux.config +1 -0
index 75670936e5..e4f94c87c9 100644
@@ -45,6 +45,7 @@ CONFIG_DRM_PANEL_SIMPLE=m
 CONFIG_FRAMEBUFFER_CONSOLE=y
 CONFIG_FB_SIMPLE=y
 CONFIG_LCD_CLASS_DEVICE=y
+CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_SOUND=y
 CONFIG_SND=y
 CONFIG_USB=y
board/olpc/xo-1.75/linux.config +0 -1
index 4a779a3b23..f8c0bff5cc 100644
@@ -19,7 +19,6 @@ CONFIG_DRM_ARMADA=y
 CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_SIMPLE_BRIDGE=m
 CONFIG_DRM_ETNAVIV=m
-CONFIG_BACKLIGHT_CLASS_DEVICE=y
 CONFIG_USB_EHCI_MV=y
 CONFIG_MMC_SDHCI_PXAV3=y
 CONFIG_OLPC_XO175=y
Signature · 1 line
2.26.2
#4 lore raw

PATCH v2 4/17 board/olpc: move the SDHCI drivers to appropriate board configs

In reply to Lubomir Rintel

Platform driver on XO-1.75, PCI on XO-1.

---
 board/olpc/linux.config         | 2 --
 board/olpc/xo-1.75/linux.config | 1 +
 board/olpc/xo-1/linux.config    | 1 +
 3 files changed, 2 insertions(+), 2 deletions(-)
board/olpc/linux.config +0 -2
index e4f94c87c9..4ba157cf0b 100644
@@ -53,8 +53,6 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
-CONFIG_MMC_SDHCI_PCI=y
-CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
board/olpc/xo-1.75/linux.config +1 -0
index f8c0bff5cc..b686950799 100644
@@ -20,6 +20,7 @@ CONFIG_DRM_DISPLAY_CONNECTOR=m
 CONFIG_DRM_SIMPLE_BRIDGE=m
 CONFIG_DRM_ETNAVIV=m
 CONFIG_USB_EHCI_MV=y
+CONFIG_MMC_SDHCI_PLTFM=y
 CONFIG_MMC_SDHCI_PXAV3=y
 CONFIG_OLPC_XO175=y
 CONFIG_OLPC_XO175_EC=y
board/olpc/xo-1/linux.config +1 -0
index 594ee9547e..8ed10ff62b 100644
@@ -65,6 +65,7 @@ CONFIG_SND_AC97_POWER_SAVE=y
 CONFIG_SND_CS5535AUDIO=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_OHCI_HCD=y
+CONFIG_MMC_SDHCI_PCI=y
 CONFIG_FB_OLPC_DCON=y
 CONFIG_XO1_RFKILL=y
 CONFIG_RESET_CONTROLLER=y
Signature · 1 line
2.26.2
#5 lore raw

PATCH v2 5/17 board/olpc: move GPIO_SYSFS to common config

In reply to Lubomir Rintel

It's not specific to XO-1.

---
 board/olpc/linux.config      | 1 +
 board/olpc/xo-1/linux.config | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
board/olpc/linux.config +1 -0
index 4ba157cf0b..01de870730 100644
@@ -21,6 +21,7 @@ CONFIG_BLK_DEV_SR=y
 CONFIG_CHR_DEV_SG=y
 CONFIG_MTD=y
 CONFIG_MTD_BLOCK=y
+CONFIG_GPIO_SYSFS=y
 CONFIG_NETDEVICES=y
 CONFIG_LIBERTAS=m
 CONFIG_INPUT_MOUSEDEV=y
board/olpc/xo-1/linux.config +0 -1
index 8ed10ff62b..0680e073cb 100644
@@ -44,7 +44,6 @@ CONFIG_NVRAM=y
 CONFIG_SCx200_ACB=y
 CONFIG_PINCTRL=y
 CONFIG_PINCTRL_SINGLE=y
-CONFIG_GPIO_SYSFS=y
 CONFIG_GPIO_CS5535=y
 CONFIG_THERMAL=y
 CONFIG_WATCHDOG=y
Signature · 1 line
2.26.2
#6 lore raw

PATCH v2 6/17 board/olpc: move LIS3_SPI to XO-1.75

In reply to Lubomir Rintel

It's only present on ARM OLPC laptops.

---
 board/olpc/xo-1.75/linux.config | 1 +
 board/olpc/xo-1/linux.config    | 1 -
 2 files changed, 1 insertion(+), 1 deletion(-)
board/olpc/xo-1.75/linux.config +1 -0
index b686950799..30e43a8860 100644
@@ -12,6 +12,7 @@ CONFIG_ARM_APPENDED_DTB=y
 CONFIG_ARM_ATAG_DTB_COMPAT=y
 CONFIG_VFP=y
 CONFIG_NEON=y
+CONFIG_SENSORS_LIS3_SPI=y
 CONFIG_SERIO_OLPC_APSP=y
 CONFIG_REGULATOR_88PG86X=m
 CONFIG_VIDEO_MMP_CAMERA=y
board/olpc/xo-1/linux.config +0 -1
index 0680e073cb..9f6731a5a5 100644
@@ -29,7 +29,6 @@ CONFIG_MTD_NAND_CAFE=y
 CONFIG_MTD_UBI=y
 CONFIG_CS5535_MFGPT=y
 CONFIG_CS5535_CLOCK_EVENT_SRC=y
-CONFIG_SENSORS_LIS3_SPI=y
 CONFIG_MOUSE_PS2_OLPC=y
 CONFIG_SERIAL_8250_NR_UARTS=1
 CONFIG_SERIAL_8250_RUNTIME_UARTS=1
Signature · 1 line
2.26.2
#7 lore raw

PATCH v2 7/17 board/olpc: enable dependencies of options we use

In reply to Lubomir Rintel

A couple of config symbols were mising that things we enable depend on. Enable them.

---
 board/olpc/linux.config | 4 ++++
 1 file changed, 4 insertions(+)
board/olpc/linux.config +4 -0
index 01de870730..538f7c5949 100644
@@ -32,6 +32,7 @@ CONFIG_INPUT_EVDEV=y
 CONFIG_INPUT_TABLET=y
 CONFIG_SERIAL_8250=y
 CONFIG_SERIAL_8250_CONSOLE=y
+CONFIG_POWER_SUPPLY=y
 CONFIG_BATTERY_OLPC=y
 CONFIG_REGULATOR_FIXED_VOLTAGE=y
 CONFIG_MEDIA_SUPPORT=y
@@ -54,14 +55,17 @@ CONFIG_USB_EHCI_HCD=y
 CONFIG_USB_STORAGE=y
 CONFIG_MMC=y
 CONFIG_MMC_SDHCI=y
+CONFIG_NEW_LEDS=y
 CONFIG_LEDS_CLASS=y
 CONFIG_LEDS_GPIO=y
+CONFIG_LEDS_TRIGGERS=y
 CONFIG_LEDS_TRIGGER_HEARTBEAT=y
 CONFIG_LEDS_TRIGGER_DEFAULT_ON=y
 CONFIG_RTC_CLASS=y
 CONFIG_EXT4_FS=y
 CONFIG_MSDOS_FS=y
 CONFIG_VFAT_FS=y
+CONFIG_TMPFS=y
 CONFIG_TMPFS_POSIX_ACL=y
 CONFIG_FONTS=y
 CONFIG_FONT_TER16x32=y
Signature · 1 line
2.26.2
#8 lore raw

PATCH v2 8/17 board/olpc/xo-1: enable JFFS2

In reply to Lubomir Rintel

The XO-1 laptop has a NAND flash an firmware capable of reading JFFS2 from it. Enable JFFS2 kernel support so that we'll be able to create images capable of booting from the internal flash.

---
 board/olpc/xo-1/linux.config | 1 +
 1 file changed, 1 insertion(+)
board/olpc/xo-1/linux.config +1 -0
index 9f6731a5a5..63566e8b90 100644
@@ -70,6 +70,7 @@ CONFIG_RESET_CONTROLLER=y
 CONFIG_GENERIC_PHY=y
 CONFIG_PROC_KCORE=y
 CONFIG_HUGETLBFS=y
+CONFIG_JFFS2_FS=y
 CONFIG_JFFS2_FS_WBUF_VERIFY=y
 CONFIG_JFFS2_SUMMARY=y
 CONFIG_JFFS2_FS_XATTR=y
Signature · 1 line
2.26.2
#9 lore raw

PATCH v2 9/17 board/olpc/xo-1: enable STAGING

In reply to Lubomir Rintel

The DCON driver for the platform is a staging driver.

---
 board/olpc/xo-1/linux.config | 1 +
 1 file changed, 1 insertion(+)
board/olpc/xo-1/linux.config +1 -0
index 63566e8b90..356fbd6071 100644
@@ -64,6 +64,7 @@ CONFIG_SND_CS5535AUDIO=y
 CONFIG_USB_EHCI_ROOT_HUB_TT=y
 CONFIG_USB_OHCI_HCD=y
 CONFIG_MMC_SDHCI_PCI=y
+CONFIG_STAGING=y
 CONFIG_FB_OLPC_DCON=y
 CONFIG_XO1_RFKILL=y
 CONFIG_RESET_CONTROLLER=y
Signature · 1 line
2.26.2
#10 lore raw

PATCH v2 10/17 board/olpc/xo-1: enable ACPI

In reply to Lubomir Rintel

The DCON drivers depends on it.

---
 board/olpc/xo-1/linux.config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
board/olpc/xo-1/linux.config +1 -1
index 356fbd6071..2541a310a5 100644
@@ -6,7 +6,7 @@ CONFIG_HZ_100=y
 CONFIG_KEXEC=y
 CONFIG_PHYSICAL_START=0x400000
 CONFIG_CMDLINE_BOOL=y
-# CONFIG_ACPI is not set
+CONFIG_ACPI=y
 CONFIG_CPU_IDLE=y
 CONFIG_CPU_IDLE_GOV_LADDER=y
 CONFIG_OLPC=y
Signature · 1 line
2.26.2
#11 lore raw

PATCH v2 11/17 board/olpc/xo-1: drop garbage from kernel config

In reply to Lubomir Rintel

These are unnecessary in a defconfig.

---
 board/olpc/xo-1/linux.config | 4 ----
 1 file changed, 4 deletions(-)
board/olpc/xo-1/linux.config +0 -4
index 2541a310a5..12919471a2 100644
@@ -4,7 +4,6 @@ CONFIG_MGEODE_LX=y
 CONFIG_X86_MSR=y
 CONFIG_HZ_100=y
 CONFIG_KEXEC=y
-CONFIG_PHYSICAL_START=0x400000
 CONFIG_CMDLINE_BOOL=y
 CONFIG_ACPI=y
 CONFIG_CPU_IDLE=y
@@ -13,10 +12,7 @@ CONFIG_OLPC=y
 CONFIG_OLPC_XO1_PM=y
 CONFIG_OLPC_XO1_RTC=y
 CONFIG_OLPC_XO1_SCI=y
-# CONFIG_FIRMWARE_MEMMAP is not set
 # CONFIG_VIRTUALIZATION is not set
-CONFIG_ARCH_MMAP_RND_BITS=16
-CONFIG_REFCOUNT_FULL=y
 CONFIG_SPARSEMEM_MANUAL=y
 CONFIG_CMA=y
 CONFIG_MTD_CMDLINE_PARTS=y
Signature · 1 line
2.26.2
#12 lore raw

PATCH v2 12/17 board/olpc: set JFFS2 root when booting from a MTD

In reply to Lubomir Rintel

This makes the boot script set appropriate root parameters when it's loaded from a NAND flash device.

---
 board/olpc/olpc.fth | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)
board/olpc/olpc.fth +5 -4
index 678f0af5b5..b4cbecf11f 100644
@@ -5,10 +5,11 @@
 
 " /aliases" find-device " last" get-property
 abort" No last alias"
-" /pci/sd at c"          2over substring?  if  " root=/dev/mmcblk0p1 " to boot-file  then
-" /sd/sdhci at d4280000" 2over substring?  if  " root=/dev/mmcblk1p1 " to boot-file  then
-" /pci/usb@"          2over substring?  if  " root=/dev/sda1 "      to boot-file  then
-" /usb@"              2over substring?  if  " root=/dev/sda1 "      to boot-file  then
+" /pci/sd at c"          2over substring?  if  " root=/dev/mmcblk0p1 "                  to boot-file  then
+" /sd/sdhci at d4280000" 2over substring?  if  " root=/dev/mmcblk1p1 "                  to boot-file  then
+" /pci/usb@"          2over substring?  if  " root=/dev/sda1 "                       to boot-file  then
+" /usb@"              2over substring?  if  " root=/dev/sda1 "                       to boot-file  then
+" /pci/nandflash at c"   2over substring?  if  " root=/dev/mtdblock0 rootfstype=jffs2 " to boot-file  then
 2drop
 
 root-device " compatible" get-property dend  if  0 0  then  ( compatible$ )
Signature · 1 line
2.26.2
#13 lore raw

PATCH v2 13/17 configs/olpc_xo1: enable JFFS2 image

In reply to Lubomir Rintel

The machine has a NAND flash device and firmware capable of loading the OS from a JFFS2 file system on it. Enable creation of JFFS2 image that can be written to said flash device.

---
 configs/olpc_xo1_defconfig | 4 ++++
 1 file changed, 4 insertions(+)
configs/olpc_xo1_defconfig +4 -0
index 5919f6ab36..36ac051ffb 100644
@@ -21,4 +21,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_LABEL="XO1"
 BR2_TARGET_ROOTFS_EXT2_SIZE="32M"
 BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O dir_index,^huge_file,^64bit,^extent"
+BR2_TARGET_ROOTFS_JFFS2=y
+BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y
+BR2_TARGET_ROOTFS_JFFS2_PAD=y
 BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTD=y
Signature · 1 line
2.26.2
#14 lore raw

PATCH v2 13/17 configs/olpc_xo1: enable JFFS2 image

Quoted 14 lines · On Wed, 17 Jun 2020 12:49:21 +0200 Lubomir Rintel <[email protected]> wrote:

The machine has a NAND flash device and firmware capable of loading the OS from a JFFS2 file system on it. Enable creation of JFFS2 image that can be written to said flash device.

---
 configs/olpc_xo1_defconfig | 4 ++++
 1 file changed, 4 insertions(+)
configs/olpc_xo1_defconfig +0 -0
index 5919f6ab36..36ac051ffb 100644

configs/olpc_xo1_defconfig BR2_TARGET_ROOTFS_EXT2_4=y · line 28

Quoted 8 lines
configs/olpc_xo1_defconfig +4 -0
@@ -21,4 +21,8 @@ BR2_TARGET_ROOTFS_EXT2_4=y
 BR2_TARGET_ROOTFS_EXT2_LABEL="XO1"
 BR2_TARGET_ROOTFS_EXT2_SIZE="32M"
 BR2_TARGET_ROOTFS_EXT2_MKFS_OPTIONS="-O dir_index,^huge_file,^64bit,^extent"
+BR2_TARGET_ROOTFS_JFFS2=y
+BR2_TARGET_ROOTFS_JFFS2_NANDFLASH_128K=y
+BR2_TARGET_ROOTFS_JFFS2_PAD=y
 BR2_PACKAGE_HOST_GENIMAGE=y
+BR2_PACKAGE_HOST_MTD=y

This last line is not needed: host-mtd is already a dependency of the jffs2 filesystem logic, see fs/jffs2/jffs2.mk. So I dropped this last line.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#15 lore raw

PATCH v2 14/17 board/olpc: move the paragraph on firmware up in the readme

In reply to Lubomir Rintel
---
 board/olpc/readme.txt | 24 ++++++++++++------------
 1 file changed, 12 insertions(+), 12 deletions(-)
board/olpc/readme.txt +12 -12
index d57635926e..2ed44011f7 100644
@@ -28,18 +28,6 @@ Then:
   $ make menuconfig           # Customize the build configuration
   $ make                      # Build
 
-Create the bootable media
-=========================
-
-When the build is finished, the resulting image file will be called
-"sdcard.img". It can be written directly to a SD-card or and USB flash stick.
-
-Please double check that you're using the right device (e.g. with "lsblk"
-command). Doing the following will DESTROY ALL DATA that's currently on the
-media.
-
-  # cat output/images/sdcard.img >/dev/<device>
-
 Preparing the machine
 =====================
 
@@ -71,6 +59,18 @@ to update the firmware:
   ok flash ext:\q4e00ja.rom   \ Flash the "q4e00ja.rom" from the SD card
   ok flash u:\q4e00ja.rom     \ Flash the "q4e00ja.rom" from USB stick
 
+Create the bootable media
+=========================
+
+When the build is finished, the resulting image file will be called
+"sdcard.img". It can be written directly to a SD-card or and USB flash stick.
+
+Please double check that you're using the right device (e.g. with "lsblk"
+command). Doing the following will DESTROY ALL DATA that's currently on the
+media.
+
+  # cat output/images/sdcard.img >/dev/<device>
+
 Booting the machine
 ===================
 
Signature · 1 line
2.26.2
#16 lore raw

PATCH v2 15/17 board/olpc: document flashing the JFFS2 image

In reply to Lubomir Rintel
---
 board/olpc/readme.txt | 38 +++++++++++++++++++++++++++++---------
 1 file changed, 29 insertions(+), 9 deletions(-)
board/olpc/readme.txt +29 -9
index 2ed44011f7..f04ad7037c 100644
@@ -9,10 +9,13 @@ Supported models
 
 * OLPC XO-1
   The original NS Geode based OLPC laptop, uses the x86 architecture.
+  Can be booted either from an internal MTD device formatted with JFFS2
+  or from a FAT or EXT4 partition on a SD card or a USB flash stick.
 
 * OLPC XO-7.5
   The ARM-based laptop. Needs a recent enough firmware to provide a good
-  enough flattened device tree to the kernel.
+  enough flattened device tree to the kernel. Can be from a FAT or EXT4
+  partition on a internal eMMC, a SD card or a USB flash stick.
 
 Configure and build
 ===================
@@ -59,20 +62,37 @@ to update the firmware:
   ok flash ext:\q4e00ja.rom   \ Flash the "q4e00ja.rom" from the SD card
   ok flash u:\q4e00ja.rom     \ Flash the "q4e00ja.rom" from USB stick
 
-Create the bootable media
-=========================
+Create the bootable SD card or USB flash stick
+==============================================
 
-When the build is finished, the resulting image file will be called
-"sdcard.img". It can be written directly to a SD-card or and USB flash stick.
+When the build is finished, an image file called "sdcard.img" will be created.
+It is suitable for writing directly to a SD card, USB flash stick or (on a
+XO-1.75) the internal eMMC flash.
 
-Please double check that you're using the right device (e.g. with "lsblk"
-command). Doing the following will DESTROY ALL DATA that's currently on the
-media.
+Before writing the image, please double check that you're using the right
+device (e.g. with "lsblk" command). Doing the following will DESTROY ALL DATA
+that's currently on the media.
 
   # cat output/images/sdcard.img >/dev/<device>
 
+Flashing the JFFS2 image (XO-1 only)
+====================================
+
+Unlike XO-1.75, the internal NAND flash on XO-1 is accessed without a FTL
+and needs a filesystem flash-friendly filesystem. A build configured for
+XO-1 creates a file named "root.jffs2" that can be written to it.
+
+One way to write it is from the Open Firmware prompt. First, partition
+and format a USB flash disk with a FAT file system and place the
+"root.jffs2" file onto it. Then power on the machine, enter the
+Open Firmware port by pressing the ESC key and run the following:
+
+  ok patch noop ?open-crcs copy-nand  \ Disable CRC check
+  ok copy-nand u:\root.jffs2
+
 Booting the machine
 ===================
 
 Once your machine is unlocked, it will automatically boot from your media
-wherever it will detect it attached to the USB bus or the SD card slot.
+wherever it will detect it attached to the USB bus or the SD card slot,
+otherwise it will proceed booting from the internal flash.
Signature · 1 line
2.26.2
#17 lore raw

PATCH v2 15/17 board/olpc: document flashing the JFFS2 image

board/olpc/readme.txt to update the firmware: · line 82

Quoted 5 lines · On Wed, 17 Jun 2020 12:49:23 +0200 Lubomir Rintel <[email protected]> wrote:
board/olpc/readme.txt +5 -0
+Flashing the JFFS2 image (XO-1 only)
+====================================
+
+Unlike XO-1.75, the internal NAND flash on XO-1 is accessed without a FTL
+and needs a filesystem flash-friendly filesystem. A build configured for

"filesystem flash-friendly filesystem" was one filesystem too many :-)

I fixed that when applying.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com
#18 lore raw

PATCH v2 16/17 configs/olpc_xo1: bump kernel version

In reply to Lubomir Rintel

Update kernel to version 5.7.1.

---
Changes since v1:
- Added this patch

 configs/olpc_xo1_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
configs/olpc_xo1_defconfig +2 -2
index 36ac051ffb..79a8a77bf3 100644
@@ -1,11 +1,11 @@
 BR2_x86_geode=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/olpc/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olpc/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olpc/xo-1/linux.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olpc/linux.config"
Signature · 1 line
2.26.2
#19 lore raw

PATCH v2 17/17 configs/olpc_xo175: bump kernel version

In reply to Lubomir Rintel

Update kernel to version 5.7.1.

---
Changes since v1:
- Added this patch

 configs/olpc_xo175_defconfig | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
configs/olpc_xo175_defconfig +2 -2
index 6e31ecf92c..19075fe5a2 100644
@@ -1,12 +1,12 @@
 BR2_arm=y
 BR2_pj4=y
-BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_6=y
+BR2_PACKAGE_HOST_LINUX_HEADERS_CUSTOM_5_7=y
 BR2_ROOTFS_POST_BUILD_SCRIPT="board/olpc/post-build.sh"
 BR2_ROOTFS_POST_IMAGE_SCRIPT="support/scripts/genimage.sh"
 BR2_ROOTFS_POST_SCRIPT_ARGS="-c board/olpc/genimage.cfg"
 BR2_LINUX_KERNEL=y
 BR2_LINUX_KERNEL_CUSTOM_VERSION=y
-BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.6"
+BR2_LINUX_KERNEL_CUSTOM_VERSION_VALUE="5.7.1"
 BR2_LINUX_KERNEL_USE_CUSTOM_CONFIG=y
 BR2_LINUX_KERNEL_CUSTOM_CONFIG_FILE="board/olpc/xo-1.75/linux.config"
 BR2_LINUX_KERNEL_CONFIG_FRAGMENT_FILES="board/olpc/linux.config"
Signature · 1 line
2.26.2
#20 lore raw

v2 cover OLPC XO updates

In reply to Lubomir Rintel

Hello,

Quoted 8 lines · On Wed, 17 Jun 2020 12:49:08 +0200 Lubomir Rintel <[email protected]> wrote:

please consider applying this patch set. The ultimate goal is to enable jffs2 images for the XO-1. While I that, I noticed that while tidying up the kernel configuration, I messed up a bit and some config symbols ended up disabled.

Since this was first posted, a 5.7 kernel was release. I've tested that 5.7.1 works well on both XO-1.75 (arm) and XO-1 (x86), so I've added two patches that bump the kernel version too.

I've applied the entire series, with very small changes. I'll reply to the individual patches I tweaked, but everything is applied.

Thanks!

Thomas

Signature · 3 lines
Thomas Petazzoni, CTO, Bootlin
Embedded Linux and Kernel engineering
https://bootlin.com