에프에이리눅스 / 1611_0007_prime_oven

Download as
Browse Code »

Commit ca21f47b44e122a71754b14a8b4caac6a8251233

Authored by 장형기
1 parent d5dc2c4f41
Exists in master and in 2 other branches fhd, fhd-demo

patch name 수정

Showing 5 changed files with 125 additions and 126 deletions   Show diff stats
@@ -165,13 +165,12 @@ @@ -165,13 +165,12 @@
165 ## [파티션] 165 ## [파티션]
166 --------------------------- 166 ---------------------------
167 167
168 - start size desc  
169 - ---------- ---------- ------------------  
170 - 00-MB 64-MB reserved area  
171 - 64-MB 64-MB partition#0, FAT32 : BOOT0  
172 - 128-MB 64-MB partition#1, FAT32 : BOOT1  
173 - 192-MB 128-MB partition#2, ext4 : APP  
174 - 320-MB all partition#3, ext4 : DATA 168 + start size desc
  169 + ---------- ---------- ------------------
  170 + 00-MB 64-MB reserved area
  171 + 64-MB 192-MB partition#0, ext4 : BOOT0
  172 + 256-MB 2048-MB partition#1, ext4 : APP
  173 + 2304-MB all partition#2, ext4 : DATA
175 174
176 ------------------------------------------ 175 ------------------------------------------
177 00-MB 64-MB reserved area 176 00-MB 64-MB reserved area
buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/root/.falinux/mk-mmc-part.sh
  Diff comments   View file @ca21f47
@@ -5,34 +5,35 @@ BDEV=/dev/mmcblk0 @@ -5,34 +5,35 @@ BDEV=/dev/mmcblk0
5 PART1=p1 5 PART1=p1
6 PART2=p2 6 PART2=p2
7 PART3=p3 7 PART3=p3
8 -PART4=p4  
9 8
10 umount ${BDEV}${PART1} 9 umount ${BDEV}${PART1}
11 umount ${BDEV}${PART2} 10 umount ${BDEV}${PART2}
12 umount ${BDEV}${PART3} 11 umount ${BDEV}${PART3}
13 -umount ${BDEV}${PART4}  
14 12
15 echo "==== make partitions ===============================" 13 echo "==== make partitions ==============================="
16 -fdisk -S1 -H1 ${BDEV} << EOF 14 +## start stop desc
  15 +## ---------- ---------- ------------------
  16 +## 00-MB 64-MB reserved area
  17 +## 64-MB 192-MB partition#0, ext4 : BOOT0
  18 +## 256-MB 2048-MB partition#1, ext4 : APP
  19 +## 2304-MB all partition#2, ext4 : DATA
  20 +##
  21 +fdisk ${BDEV} << EOF
17 o 22 o
18 n 23 n
19 p 24 p
20 1 25 1
21 -131072  
22 -196607 26 +2048
  27 +8191
23 n 28 n
24 p 29 p
25 2 30 2
26 -196608  
27 -262143 31 +8192
  32 +73727
28 n 33 n
29 p 34 p
30 3 35 3
31 -262144  
32 -524287  
33 -n  
34 -p  
35 -524288 36 +73728
36 37
37 t 38 t
38 1 39 1
@@ -46,8 +47,7 @@ EOF @@ -46,8 +47,7 @@ EOF
46 ## format partitions 47 ## format partitions
47 echo "==== format partitions =============================" 48 echo "==== format partitions ============================="
48 49
49 -mkfs.fat ${BDEV}${PART1} -n BOOT0  
50 -mkfs.fat ${BDEV}${PART2} -n BOOT1  
51 -mkfs.ext4 -F ${BDEV}${PART3} -L APP  
52 -mkfs.ext4 -F ${BDEV}${PART4} -L DATA 50 +mkfs.ext4 -F ${BDEV}${PART1} -L BOOT0
  51 +mkfs.ext4 -F ${BDEV}${PART2} -L APP
  52 +mkfs.ext4 -F ${BDEV}${PART3} -L DATA
53 53
buildroot/buildroot-2016.08.1/board/falinux/prime_oven/rootfs_overlay/root/.prime_oven/.buildroot_version
  Diff comments   View file @ca21f47
1 -2017. 02. 23. (목) 20:51:04 KST 1 +2017. 03. 06. (월) 14:01:13 KST
buildroot/buildroot-2016.08.1/package/qt5/qt5base/0008-linuxfb-rotate.patch
View file @d5dc2c4
@@ -1,102 +0,0 @@ @@ -1,102 +0,0 @@
1 -diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp  
2 ---- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp 2017-03-06 15:43:16.205457343 +0900  
3 -+++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp 2017-03-06 13:38:20.857076470 +0900  
4 -@@ -280,7 +280,7 @@  
5 - }  
6 -  
7 - QLinuxFbScreen::QLinuxFbScreen(const QStringList &args)  
8 -- : mArgs(args), mFbFd(-1), mTtyFd(-1), mBlitter(0)  
9 -+ : mArgs(args), mFbFd(-1), mTtyFd(-1), mBlitter(0), mRotation(0)  
10 - {  
11 - mMmap.data = 0;  
12 - }  
13 -@@ -306,6 +306,7 @@  
14 - QRegularExpression mmSizeRx(QLatin1String("mmsize=(\\d+)x(\\d+)"));  
15 - QRegularExpression sizeRx(QLatin1String("size=(\\d+)x(\\d+)"));  
16 - QRegularExpression offsetRx(QLatin1String("offset=(\\d+)x(\\d+)"));  
17 -+ QRegularExpression rotationRx(QLatin1String("rotation=(0|90|180|270)"));  
18 -  
19 - QString fbDevice, ttyDevice;  
20 - QSize userMmSize;  
21 -@@ -327,6 +328,8 @@  
22 - ttyDevice = match.captured(1);  
23 - else if (arg.contains(fbRx, &match))  
24 - fbDevice = match.captured(1);  
25 -+ else if (arg.contains(rotationRx, &match))  
26 -+ mRotation = match.captured(1).toInt();  
27 - }  
28 -  
29 - if (fbDevice.isEmpty()) {  
30 -@@ -365,9 +368,17 @@  
31 - mDepth = determineDepth(vinfo);  
32 - mBytesPerLine = finfo.line_length;  
33 - QRect geometry = determineGeometry(vinfo, userGeometry);  
34 -+ QRect originalGeometry = geometry;  
35 -+ if( mRotation == 90 || mRotation == 270 )  
36 -+ {  
37 -+ int tmp = geometry.width();  
38 -+ geometry.setWidth(geometry.height());  
39 -+ geometry.setHeight(tmp);  
40 -+ }  
41 -+  
42 - mGeometry = QRect(QPoint(0, 0), geometry.size());  
43 - mFormat = determineFormat(vinfo, mDepth);  
44 -- mPhysicalSize = determinePhysicalSize(vinfo, userMmSize, geometry.size());  
45 -+ mPhysicalSize = determinePhysicalSize(vinfo, userMmSize, originalGeometry.size());  
46 -  
47 - // mmap the framebuffer  
48 - mMmap.size = finfo.smem_len;  
49 -@@ -377,11 +388,11 @@  
50 - return false;  
51 - }  
52 -  
53 -- mMmap.offset = geometry.y() * mBytesPerLine + geometry.x() * mDepth / 8;  
54 -+ mMmap.offset = originalGeometry.y() * mBytesPerLine + originalGeometry.x() * mDepth / 8;  
55 - mMmap.data = data + mMmap.offset;  
56 -  
57 - QFbScreen::initializeCompositor();  
58 -- mFbScreenImage = QImage(mMmap.data, geometry.width(), geometry.height(), mBytesPerLine, mFormat);  
59 -+ mFbScreenImage = QImage(mMmap.data, originalGeometry.width(), originalGeometry.height(), mBytesPerLine, mFormat);  
60 -  
61 - mCursor = new QFbCursor(this);  
62 -  
63 -@@ -409,8 +420,27 @@  
64 - mBlitter->setCompositionMode(QPainter::CompositionMode_Source);  
65 -  
66 - for (int i = 0; i < rects.size(); ++i)  
67 -+ {  
68 -+ if( mRotation == 90 || mRotation == 270 )  
69 -+ {  
70 -+ mBlitter->translate(mGeometry.height()/2, mGeometry.width()/2);  
71 -+ }  
72 -+ else if( mRotation == 180 )  
73 -+ {  
74 -+ mBlitter->translate(mGeometry.width()/2, mGeometry.height()/2);  
75 -+ }  
76 -+  
77 -+ if( mRotation != 0 )  
78 -+ {  
79 -+ mBlitter->rotate(mRotation);  
80 -+ mBlitter->translate(-mGeometry.width()/2, -mGeometry.height()/2);  
81 -+ }  
82 -+  
83 - mBlitter->drawImage(rects[i], *mScreenImage, rects[i]);  
84 -  
85 -+ mBlitter->resetTransform();  
86 -+ }  
87 -+  
88 - return touched;  
89 - }  
90 -  
91 -diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.h b/src/plugins/platforms/linuxfb/qlinuxfbscreen.h  
92 ---- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.h 2016-05-26 00:46:17.000000000 +0900  
93 -+++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.h 2017-03-06 13:38:20.857076470 +0900  
94 -@@ -58,6 +58,7 @@  
95 - QStringList mArgs;  
96 - int mFbFd;  
97 - int mTtyFd;  
98 -+ int mRotation;  
99 -  
100 - QImage mFbScreenImage;  
101 - int mBytesPerLine;  
102 -  
buildroot/buildroot-2016.08.1/package/qt5/qt5base/0008-linuxfb-rotation.patch
  Diff comments   View file @ca21f47
@@ -0,0 +1,102 @@ @@ -0,0 +1,102 @@
  1 +diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp
  2 +--- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp 2017-03-06 15:43:16.205457343 +0900
  3 ++++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.cpp 2017-03-06 13:38:20.857076470 +0900
  4 +@@ -280,7 +280,7 @@
  5 + }
  6 +
  7 + QLinuxFbScreen::QLinuxFbScreen(const QStringList &args)
  8 +- : mArgs(args), mFbFd(-1), mTtyFd(-1), mBlitter(0)
  9 ++ : mArgs(args), mFbFd(-1), mTtyFd(-1), mBlitter(0), mRotation(0)
  10 + {
  11 + mMmap.data = 0;
  12 + }
  13 +@@ -306,6 +306,7 @@
  14 + QRegularExpression mmSizeRx(QLatin1String("mmsize=(\\d+)x(\\d+)"));
  15 + QRegularExpression sizeRx(QLatin1String("size=(\\d+)x(\\d+)"));
  16 + QRegularExpression offsetRx(QLatin1String("offset=(\\d+)x(\\d+)"));
  17 ++ QRegularExpression rotationRx(QLatin1String("rotation=(0|90|180|270)"));
  18 +
  19 + QString fbDevice, ttyDevice;
  20 + QSize userMmSize;
  21 +@@ -327,6 +328,8 @@
  22 + ttyDevice = match.captured(1);
  23 + else if (arg.contains(fbRx, &match))
  24 + fbDevice = match.captured(1);
  25 ++ else if (arg.contains(rotationRx, &match))
  26 ++ mRotation = match.captured(1).toInt();
  27 + }
  28 +
  29 + if (fbDevice.isEmpty()) {
  30 +@@ -365,9 +368,17 @@
  31 + mDepth = determineDepth(vinfo);
  32 + mBytesPerLine = finfo.line_length;
  33 + QRect geometry = determineGeometry(vinfo, userGeometry);
  34 ++ QRect originalGeometry = geometry;
  35 ++ if( mRotation == 90 || mRotation == 270 )
  36 ++ {
  37 ++ int tmp = geometry.width();
  38 ++ geometry.setWidth(geometry.height());
  39 ++ geometry.setHeight(tmp);
  40 ++ }
  41 ++
  42 + mGeometry = QRect(QPoint(0, 0), geometry.size());
  43 + mFormat = determineFormat(vinfo, mDepth);
  44 +- mPhysicalSize = determinePhysicalSize(vinfo, userMmSize, geometry.size());
  45 ++ mPhysicalSize = determinePhysicalSize(vinfo, userMmSize, originalGeometry.size());
  46 +
  47 + // mmap the framebuffer
  48 + mMmap.size = finfo.smem_len;
  49 +@@ -377,11 +388,11 @@
  50 + return false;
  51 + }
  52 +
  53 +- mMmap.offset = geometry.y() * mBytesPerLine + geometry.x() * mDepth / 8;
  54 ++ mMmap.offset = originalGeometry.y() * mBytesPerLine + originalGeometry.x() * mDepth / 8;
  55 + mMmap.data = data + mMmap.offset;
  56 +
  57 + QFbScreen::initializeCompositor();
  58 +- mFbScreenImage = QImage(mMmap.data, geometry.width(), geometry.height(), mBytesPerLine, mFormat);
  59 ++ mFbScreenImage = QImage(mMmap.data, originalGeometry.width(), originalGeometry.height(), mBytesPerLine, mFormat);
  60 +
  61 + mCursor = new QFbCursor(this);
  62 +
  63 +@@ -409,8 +420,27 @@
  64 + mBlitter->setCompositionMode(QPainter::CompositionMode_Source);
  65 +
  66 + for (int i = 0; i < rects.size(); ++i)
  67 ++ {
  68 ++ if( mRotation == 90 || mRotation == 270 )
  69 ++ {
  70 ++ mBlitter->translate(mGeometry.height()/2, mGeometry.width()/2);
  71 ++ }
  72 ++ else if( mRotation == 180 )
  73 ++ {
  74 ++ mBlitter->translate(mGeometry.width()/2, mGeometry.height()/2);
  75 ++ }
  76 ++
  77 ++ if( mRotation != 0 )
  78 ++ {
  79 ++ mBlitter->rotate(mRotation);
  80 ++ mBlitter->translate(-mGeometry.width()/2, -mGeometry.height()/2);
  81 ++ }
  82 ++
  83 + mBlitter->drawImage(rects[i], *mScreenImage, rects[i]);
  84 +
  85 ++ mBlitter->resetTransform();
  86 ++ }
  87 ++
  88 + return touched;
  89 + }
  90 +
  91 +diff --git a/src/plugins/platforms/linuxfb/qlinuxfbscreen.h b/src/plugins/platforms/linuxfb/qlinuxfbscreen.h
  92 +--- a/src/plugins/platforms/linuxfb/qlinuxfbscreen.h 2016-05-26 00:46:17.000000000 +0900
  93 ++++ b/src/plugins/platforms/linuxfb/qlinuxfbscreen.h 2017-03-06 13:38:20.857076470 +0900
  94 +@@ -58,6 +58,7 @@
  95 + QStringList mArgs;
  96 + int mFbFd;
  97 + int mTtyFd;
  98 ++ int mRotation;
  99 +
  100 + QImage mFbScreenImage;
  101 + int mBytesPerLine;
  102 +