Skip to content

Commit 09baf30

Browse files
committed
kernel-development: Typo fixes
Change-Id: I49cd64147cdac1cfea17c6a71a393c07ddcbf8d1 Signed-off-by: Andrew Jeffery <[email protected]>
1 parent 4cfd5e2 commit 09baf30

File tree

1 file changed

+5
-3
lines changed

1 file changed

+5
-3
lines changed

kernel-development.md

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ The OpenBMC project maintains a fork of upstream Linux for patches that are not
55
The kernel tree hosted at https://github.com/openbmc/linux contains the set of patches that we carry. Ideally there would be no patches carried, as everything should be upstream.
66

77
Your code will make it into the OpenBMC tree in these ways, from most to least desirable:
8+
89
1. When the OpenBMC kernel moves to a new upstream release
910
2. By backporting upstream commits from a newer kernel version to the OpenBMC kernel
1011
3. Patches included in the OpenBMC tree temporarily
@@ -30,15 +31,15 @@ Once the driver has been accepted upstream, send the good news to the OpenBMC li
3031

3132
There are cases where waiting for upstream acceptance will delay the bring-up of a new system. This should be avoided through careful planning and early development of the features upstream, but where this has not happened we can chose to carry the patches in the OpenBMC tree while the upstream development is ongoing.
3233

33-
Another exception to the upstream first rule is where patches are modifying files that are not upstream. This currently includes the aspeed board file `arch/arm/mach-aspeed/aspeed.c`, and the device tree source files `dtbs`. The board file should go away when we get drivers written for all of the functionaltiy; for now it contains some hacks relating to LPC and early init.
34+
Another exception to the upstream first rule is where patches are modifying files that are not upstream. This currently includes the aspeed board file `arch/arm/mach-aspeed/aspeed.c`, and the device tree source files `dts`. The board file should go away when we get drivers written for all of the functionaltiy; for now it contains some hacks relating to LPC and early init.
3435

3536
## Getting existing code in the tree
3637

3738
The OpenBMC kernel is currently based on the 4.7 series. If there is upstream code you would like backported, send it to hte list. Be sure to include the upstream commit SHA in the commit message.
3839

3940
## Testing
4041

41-
When moifying the tree we currently test on the following platforms:
42+
When modifying the tree we currently test on the following platforms:
4243

4344
- Palmetto, an OpenPower Power8 box containing an ast2400 with NCSI networking
4445
- ast2500-evb, the Aspeed dev board with two PHYs
@@ -65,7 +66,8 @@ make ARCH=arm \
6566

6667
(adjust `O` and `CROSS_COMPILE` parameters as appropriate).
6768

68-
You'll need to use `aspeed_defconfig` as your base kernel configuration.
69+
You'll need to use `aspeed_g4_defconfig` or `aspeed_g5_defconfig` as your base
70+
kernel configuration.
6971

7072
The cpio can be found in the following yocto output directory:
7173

0 commit comments

Comments
 (0)