Skip to content

Commit dfb4083

Browse files
MBELOUARGAMBELOUARGA
authored
Merge branch 'linux4sam:kirkstone' into kirkstone
2 parents 5a760fc + f6a6941 commit dfb4083

File tree

14 files changed

+91
-7
lines changed

14 files changed

+91
-7
lines changed

‎README‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ built by adding an "-sd" suffix to the machine name.
1919
- AT91SAM9G45 / at91sam9m10g45ek
2020
- SAM9X60 / sam9x60ek, sam9x60-curiosity
2121
- SAMA7G5 / sama7g5ek-sd, sama7g5ek-emmc, sama7g5ek-ospi
22+
- SAM9X75 / sam9x75eb
2223

2324

2425
Sources

‎conf/conf-notes.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ Microchip supported machines are:
1111
- AT91SAM9RL / at91sam9rlek
1212
- AT91SAM9G45 / at91sam9m10g45ek
1313
- SAM9X60 / sam9x60ek / sam9x60-curiosity
14-
- SAM9X75 / sam9x75-curiosity-sd
14+
- SAM9X75 / sam9x75-curiosity-sd / sam9x75eb
1515
- SAMA7G5 / sama7g5ek-sd, sama7g5ek-emmc, sama7g5ek-ospi
1616
Note that most of the machine names above, have a SD Card variant that can be
1717
built by adding an "-sd" suffix to the machine name.

‎conf/machine/sam9x75eb-sd.conf‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#@TYPE: Machine
2+
#@Name: MICROCHIP SAM9X75EB SD
3+
#@DESCRIPTION: Machine configuration for Microchip SAM9X75EB board
4+
5+
require include/sam9x75.inc
6+
7+
MACHINE_FEATURES = "apm alsa ext2 ext3 usbhost usbgadget screen touchscreen"
8+
KERNEL_DEVICETREE = " at91-sam9x75eb.dtb "
9+
KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} at91_dt_defconfig"
10+
11+
IMAGE_FSTYPES += " tar.gz wic"
12+
13+
do_image_wic[depends] += "u-boot-mchp:do_deploy"
14+
WKS_FILE = "sdimage-bootpart.wks"
15+
IMAGE_BOOT_FILES = "BOOT.BIN u-boot.bin uboot.env sam9x75eb.itb"
16+
17+
UBOOT_MACHINE ?= "sam9x75eb_mmc_defconfig"
18+
UBOOT_ENTRYPOINT = "0x20008000"
19+
UBOOT_LOADADDRESS = "0x20008000"
20+
UBOOT_ENV_SIZE = "0x4000"
21+
22+
AT91BOOTSTRAP_MACHINE ?= "sam9x75eb"
23+
24+
# Needed for wic
25+
EXTRA_IMAGEDEPENDS += "dosfstools-native mtools-native"
26+
27+
# Needed for FIT
28+
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " dt-overlay-mchp"

‎conf/machine/sam9x75eb.conf‎

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
#@TYPE: Machine
2+
#@Name: MICROCHIP SAM9X75EB NAND
3+
#@DESCRIPTION: Machine configuration for Microchip SAM9X75EB board
4+
5+
require include/sam9x75.inc
6+
7+
MACHINE_FEATURES = "apm alsa ext2 ext3 usbhost usbgadget screen touchscreen"
8+
KERNEL_DEVICETREE = " at91-sam9x75eb.dtb "
9+
KERNEL_CONFIG_COMMAND = "oe_runmake -C ${S} O=${B} at91_dt_defconfig"
10+
11+
IMAGE_FSTYPES += " ubi tar.gz"
12+
13+
# NAND
14+
MKUBIFS_ARGS = " -e 0x3e000 -c 2082 -m 0x1000 -x lzo"
15+
UBINIZE_ARGS = " -m 0x1000 -p 0x40000"
16+
MKENVIMAGE_EXTRA_ARGS = " -r "
17+
18+
UBI_VOLNAME = "rootfs"
19+
20+
UBOOT_MACHINE ?= "sam9x75eb_nandflash_defconfig"
21+
UBOOT_ENTRYPOINT = "0x20008000"
22+
UBOOT_LOADADDRESS = "0x20008000"
23+
UBOOT_ENV_SIZE = "0x20000"
24+
25+
AT91BOOTSTRAP_MACHINE ?= "sam9x75eb"
26+
27+
# Needed for FIT
28+
MACHINE_ESSENTIAL_EXTRA_RDEPENDS = " dt-overlay-mchp"

‎flashing.txt‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,6 +19,7 @@ Connect the board:
1919
o sam9x60: DBGU: J24, USB sam-ba: J8
2020
o sama5d27 wlsom1 ek: DBGU: J26, USB sam-ba: J10
2121
o sam9x60 curiosity: DBGU: J11, USB sam-ba: J1
22+
o sam9x75eb: DBGU: J34, USB sam-ba: U6 near RESET button
2223

2324
Start the board in RomBOOT:
2425
o at91sam9g45m10ek:
@@ -78,6 +79,11 @@ Start the board in RomBOOT:
7879
1. open J4 (NANDCS) and Remove SDMMC card.
7980
2. Power on the board
8081

82+
o sam9x75eb:
83+
1. Power on the board
84+
2. Remove SDMMC card and press DISABLE BOOT switch
85+
3. Reboot the board
86+
8187
"RomBOOT" should appear on your console (this should be ttyUSBx or ttyACMx)
8288

8389
Now locate the USB sam-ba interface it should be ttyACMx, usually ttyACM0

‎recipes-atmel/images/microchip-graphics-image.bb‎

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -110,7 +110,11 @@ IMAGE_INSTALL:append:sam9x60 = " \
110110
bonnie++ \
111111
libm2d "
112112

113-
IMAGE_INSTALL:append:sam9x75-curiosity-sd = " video-capture-at91"
113+
IMAGE_INSTALL:append:sam9x75 = " \
114+
bonnie++ \
115+
video-capture-at91 \
116+
media-ctl \
117+
yavta "
114118

115119
# packages needed for greengrass with ECC608
116120
IMAGE_INSTALL:append:sama5d2 = " cryptoauthlib python3-cryptoauthlib p11-kit"

‎recipes-bsp/at91bootstrap/at91bootstrap.inc‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -43,6 +43,8 @@ AT91BOOTSTRAP_CONFIG:sama7g5ek-ospi ??= "${AT91BOOTSTRAP_MACHINE}df_qspi_uboot"
4343
AT91BOOTSTRAP_CONFIG:sam9x60-curiosity ??= "${AT91BOOTSTRAP_MACHINE}nf_uboot"
4444
AT91BOOTSTRAP_CONFIG:sam9x60-curiosity-sd ??= "${AT91BOOTSTRAP_MACHINE}sd_uboot"
4545
AT91BOOTSTRAP_CONFIG:sam9x75-curiosity-sd ??= "${AT91BOOTSTRAP_MACHINE}sd_uboot"
46+
AT91BOOTSTRAP_CONFIG:sam9x75eb ??= "${AT91BOOTSTRAP_MACHINE}nf_uboot"
47+
AT91BOOTSTRAP_CONFIG:sam9x75eb-sd ??= "${AT91BOOTSTRAP_MACHINE}sd_uboot"
4648

4749
AT91BOOTSTRAP_TARGET ??= "${AT91BOOTSTRAP_CONFIG}_defconfig"
4850
AT91BOOTSTRAP_LOAD ??= "nandflashboot-uboot"
@@ -64,6 +66,7 @@ AT91BOOTSTRAP_LOAD:sama7g5ek-emmc ??= "sdboot-uboot"
6466
AT91BOOTSTRAP_LOAD:sama7g5ek-ospi ??= "dataflashboot-uboot"
6567
AT91BOOTSTRAP_LOAD:sam9x60-curiosity-sd ??= "sdboot-uboot"
6668
AT91BOOTSTRAP_LOAD:sam9x75-curiosity-sd ??= "sdboot-uboot"
69+
AT91BOOTSTRAP_LOAD:sam9x75eb-sd ??= "sdboot-uboot"
6770

6871
AT91BOOTSTRAP_SUFFIX ?= "bin"
6972
AT91BOOTSTRAP_IMAGE ?= "${AT91BOOTSTRAP_MACHINE}-${AT91BOOTSTRAP_LOAD}-${PV}.${AT91BOOTSTRAP_SUFFIX}"

‎recipes-bsp/at91bootstrap/at91bootstrap_4.x.bb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ require at91bootstrap.inc
33
LICENSE = "MIT"
44
LIC_FILES_CHKSUM = "file://LICENSES/MIT.txt;md5=12c44f58fe16bd407f016e45950c2f3d"
55

6-
COMPATIBLE_MACHINE = '(sama5d3-xplained|sama5d3-xplained-sd|sama5d4-xplained|sama5d4-xplained-sd|sama5d2-xplained|sama5d2-xplained-sd|sama5d2-xplained-emmc|sama5d2-ptc-ek|sama5d2-ptc-ek-sd|sama5d27-som1-ek|sama5d27-som1-ek-sd|sama5d27-som1-ek-optee-sd|sama5d2-icp-sd|sam9x60ek|sam9x60ek-sd|sama5d27-wlsom1-ek-sd|sama5d29-curiosity-sd|sama7g5ek-sd|sama7g5ek-emmc|sama7g5ek-ospi|sam9x60-curiosity|sam9x60-curiosity-sd|sam9x75-curiosity-sd)'
6+
COMPATIBLE_MACHINE = '(sama5d3-xplained|sama5d3-xplained-sd|sama5d4-xplained|sama5d4-xplained-sd|sama5d2-xplained|sama5d2-xplained-sd|sama5d2-xplained-emmc|sama5d2-ptc-ek|sama5d2-ptc-ek-sd|sama5d27-som1-ek|sama5d27-som1-ek-sd|sama5d27-som1-ek-optee-sd|sama5d2-icp-sd|sam9x60ek|sam9x60ek-sd|sama5d27-wlsom1-ek-sd|sama5d29-curiosity-sd|sama7g5ek-sd|sama7g5ek-emmc|sama7g5ek-ospi|sam9x60-curiosity|sam9x60-curiosity-sd|sam9x75-curiosity-sd|sam9x75eb|sam9x75eb-sd)'
77

88
SRC_URI = "git://github.com/linux4sam/at91bootstrap.git;protocol=https;branch=at91bootstrap-4.x"
99

‎recipes-bsp/dt-overlay-mchp/dt-overlay-mchp_git.bb‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LIC_FILES_CHKSUM = "file://COPYING;md5=775626b7bc958bdcc525161f725ece0f \
66

77
inherit deploy
88

9-
COMPATIBLE_MACHINE = '(sama5d3-xplained|sama5d3-xplained-sd|at91sam9x5ek|at91sam9x5ek-sd|sama5d4-xplained|sama5d4-xplained-sd|sama5d2-xplained|sama5d2-xplained-sd|sama5d2-xplained-emmc|sama5d2-ptc-ek|sama5d2-ptc-ek-sd|sama5d27-som1-ek|sama5d27-som1-ek-sd|sama5d2-icp-sd|sam9x60ek|sam9x60ek-sd|sama5d27-wlsom1-ek-sd|sama5d29-curiosity-sd|sama7g5ek|sam9x60-curiosity|sam9x60-curiosity-sd|sam9x75-curiosity-sd)'
9+
COMPATIBLE_MACHINE = '(sama5d3-xplained|sama5d3-xplained-sd|at91sam9x5ek|at91sam9x5ek-sd|sama5d4-xplained|sama5d4-xplained-sd|sama5d2-xplained|sama5d2-xplained-sd|sama5d2-xplained-emmc|sama5d2-ptc-ek|sama5d2-ptc-ek-sd|sama5d27-som1-ek|sama5d27-som1-ek-sd|sama5d2-icp-sd|sam9x60ek|sam9x60ek-sd|sama5d27-wlsom1-ek-sd|sama5d29-curiosity-sd|sama7g5ek|sam9x60-curiosity|sam9x60-curiosity-sd|sam9x75-curiosity-sd|sam9x75eb|sam9x75eb-sd)'
1010

1111
SRC_URI = "git://github.com/linux4microchip/dt-overlay-mchp.git;protocol=https;branch=master"
1212

‎recipes-bsp/u-boot/files/envs/sam9x75eb-sd.txt‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
bootargs=console=ttyS0,115200 root=/dev/mmcblk0p2 rw rootfstype=ext4 rootwait atmel.pm_modes=standby,ulp0
2+
bootcmd=fatload mmc 0:1 0x24000000 sam9x75eb.itb; bootm 0x24000000#kernel_dtb
3+
bootdelay=1
4+
ethact=gmac0
5+
stderr=serial
6+
stdin=serial
7+
stdout=serial

0 commit comments

Comments
 (0)